Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Revert "Revert "Merge branch 'dev' of ↵ | Flenk008 | 2023-03-13 |
| | | | | | | https://github.com/Flenk008/avans-arcade into dev"" This reverts commit a9ad8e0a8ac5346108f1e2c1a0bf9360fadc20da. | ||
* | Revert "Background collision" | Flenk008 | 2023-03-13 |
| | | | | This reverts commit e47f7fa198229b8598b8ab03ef8b2483f7c685bc. | ||
* | Revert "Merge branch 'dev' of https://github.com/Flenk008/avans-arcade into dev" | Flenk008 | 2023-03-13 |
| | | | | | This reverts commit 4f489426e05fb3b296998b17859d8702cc4f37e1, reversing changes made to e47f7fa198229b8598b8ab03ef8b2483f7c685bc. | ||
* | Merge branch 'dev' of https://github.com/Flenk008/avans-arcade into dev | Flenk008 | 2023-03-13 |
|\ | |||
| * | Merge pull request #28 from UnavailableDev/game-engine | UnavailableDev | 2023-03-13 |
| |\ | | | | | | | Game engine | ||
| | * | Merge branch 'game-engine' of https://github.com/UnavailableDev/avans-arcade ↵ | UnavailableDev | 2023-03-13 |
| | |\ | | | | | | | | | | | | | into game-engine | ||
| | | * | Merge branch 'dev' into game-engine | UnavailableDev | 2023-03-13 |
| | | |\ | | |_|/ | |/| | | |||
| * | | | Merge pull request #33 from Flenk008/dev | UnavailableDev | 2023-03-13 |
| |\ \ \ | | | | | | | | | | | Fixed Movement of player | ||
| | | | * | Merge branch 'lonkaars:dev' into game-engine | UnavailableDev | 2023-03-13 |
| | | | |\ | | |_|_|/ | |/| | | | |||
| * | | | | Merge pull request #34 from heavydemon21/dev | UnavailableDev | 2023-03-13 |
| |\ \ \ \ | | | | | | | | | | | | | features for our game | ||
| | * | | | | features voor ons spel | NielsCoding | 2023-03-13 |
| |/ / / / | |||
| | | * / | demo.c clean up | UnavailableDev | 2023-03-13 |
| | | |/ | |||
| | | * | demo.c | UnavailableDev | 2023-03-13 |
| | | | | |||
| | | * | camera, movement, collisions | UnavailableDev | 2023-03-13 |
| | | | | |||
| | | * | makefile update | UnavailableDev | 2023-03-12 |
| | | | | |||
| | | * | camera movement | UnavailableDev | 2023-03-12 |
| | | | | |||
| | | * | Merge branch 'game-engine' of https://github.com/UnavailableDev/avans-arcade ↵ | UnavailableDev | 2023-03-12 |
| | | |\ | | | | | | | | | | | | | | | | into game-engine | ||
| | | | * | Merge branch 'lonkaars:dev' into game-engine | UnavailableDev | 2023-03-12 |
| | | | |\ | | |_|_|/ | |/| | | | |||
| * | | | | Merge pull request #32 from heavydemon21/dev | UnavailableDev | 2023-03-12 |
| |\ \ \ \ | | | | | | | | | | | | | drawing map en read from binary complete. shift to background. | ||
| | * | | | | syntax update | UnavailableDev | 2023-03-12 |
| | | | | | | |||
| | * | | | | drawing map en read from binary complete. shift to background. | NielsCoding | 2023-03-11 |
| | | | | | | |||
| | | | * | | integrated palettes and fixed reading tiles | UnavailableDev | 2023-03-12 |
| | | | | | | |||
| | | | * | | C: | UnavailableDev | 2023-03-11 |
| | | | |/ | |||
| | | | * | Merge branch 'lonkaars:dev' into game-engine | UnavailableDev | 2023-03-11 |
| | | | |\ | | |_|_|/ | |/| | | | |||
| | | | * | gitignore update includes .bin files in home dir | UnavailableDev | 2023-03-11 |
| | | | |\ | |||
| | | | * \ | merge | UnavailableDev | 2023-03-11 |
| | | | |\ \ | |||
| | | | * | | | removed TODO | UnavailableDev | 2023-03-10 |
| | | | | | | | |||
* | | | | | | | Background collision | Flenk008 | 2023-03-13 |
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | Added background collision for player and other entities. Added gravity and jump functionailty | ||
* | | | | | | Merge branch 'lonkaars:dev' into dev | Flenk008 | 2023-03-11 |
|\| | | | | | |||
| * | | | | | Merge pull request #30 from heavydemon21/dev | UnavailableDev | 2023-03-11 |
| |\| | | | | | |_|_|/ | |/| | | | Dev | ||
| | * | | | makefile engine | NielsCoding | 2023-03-11 |
| | | | | | |||
| | * | | | moved files | NielsCoding | 2023-03-11 |
| |/ / / | |||
* | | | | Fixed movement | Flenk008 | 2023-03-11 |
| | | | | | | | | | | | | | | | | Adjusted movement speed otherwise wouldnt show any movement. Also changed input testing lines so it does work | ||
* | | | | Merge branch 'lonkaars:dev' into dev | Flenk008 | 2023-03-10 |
|\| | | | |||
| * | | | Merge pull request #27 from UnavailableDev/game-engine | UnavailableDev | 2023-03-10 |
| |\ \ \ | | | |/ | | |/| | Game engine | ||
| | * | | Update test_file_read.c | UnavailableDev | 2023-03-10 |
| | | | | |||
| | * | | removed TODO | UnavailableDev | 2023-03-10 |
| | | | | |||
| | * | | Delete tiles.bs | UnavailableDev | 2023-03-10 |
| | | | | |||
| | * | | Delete settings.json | UnavailableDev | 2023-03-10 |
| | | | | |||
| | * | | Delete c_cpp_properties.json | UnavailableDev | 2023-03-10 |
| | | | | |||
| | * | | Merge branch 'lonkaars:dev' into game-engine | UnavailableDev | 2023-03-10 |
| | |\ \ | | |/ / | |/| / | | |/ | |||
| * | | top.vhdl | lonkaars | 2023-03-10 |
| | | | |||
| * | | move pinout.md to schematic | lonkaars | 2023-03-10 |
| | | | |||
| | * | ppusim read sprites from file and put into vram | UnavailableDev | 2023-03-10 |
| | | | |||
| | * | fixed code styles | UnavailableDev | 2023-03-10 |
| | | | |||
| | * | merge | UnavailableDev | 2023-03-10 |
| | |\ | | |/ | |/| | |||
| | * | Merge branch 'game-engine' of https://github.com/UnavailableDev/avans-arcade ↵ | UnavailableDev | 2023-03-10 |
| | |\ | | | | | | | | | | | | | into game-engine | ||
| | * | | nope | UnavailableDev | 2023-03-10 |
| | | | | |||
| | * | | spelling correction | UnavailableDev | 2023-03-08 |
| | | | | |||
* | | | | Merge branch 'lonkaars:dev' into dev | Flenk008 | 2023-03-10 |
|\| | | |