aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'dev' of https://github.com/Flenk008/avans-arcade into devFlenk0082023-03-14
|\
| * Merge pull request #35 from UnavailableDev/game-engineUnavailableDev2023-03-14
| |\
| | * merge?UnavailableDev2023-03-14
| | |\ | | |/ | |/|
| | * camera y-axis bug fixed + clean upUnavailableDev2023-03-14
* | | Revert "Revert "Merge branch 'dev' of https://github.com/Flenk008/avans-arcad...Flenk0082023-03-13
* | | Revert "Background collision"Flenk0082023-03-13
* | | Revert "Merge branch 'dev' of https://github.com/Flenk008/avans-arcade into dev"Flenk0082023-03-13
* | | Merge branch 'dev' of https://github.com/Flenk008/avans-arcade into devFlenk0082023-03-13
|\| |
| * | Merge pull request #28 from UnavailableDev/game-engineUnavailableDev2023-03-13
| |\|
| | * Merge branch 'game-engine' of https://github.com/UnavailableDev/avans-arcade ...UnavailableDev2023-03-13
| | |\
| | | * Merge branch 'dev' into game-engineUnavailableDev2023-03-13
| | | |\ | | |_|/ | |/| |
| * | | Merge pull request #33 from Flenk008/devUnavailableDev2023-03-13
| |\ \ \
| | | | * Merge branch 'lonkaars:dev' into game-engineUnavailableDev2023-03-13
| | | | |\ | | |_|_|/ | |/| | |
| * | | | Merge pull request #34 from heavydemon21/devUnavailableDev2023-03-13
| |\ \ \ \
| | * | | | features voor ons spelNielsCoding2023-03-13
| |/ / / /
| | | * / demo.c clean upUnavailableDev2023-03-13
| | | |/
| | | * demo.cUnavailableDev2023-03-13
| | | * camera, movement, collisionsUnavailableDev2023-03-13
| | | * makefile updateUnavailableDev2023-03-12
| | | * camera movementUnavailableDev2023-03-12
| | | * Merge branch 'game-engine' of https://github.com/UnavailableDev/avans-arcade ...UnavailableDev2023-03-12
| | | |\
| | | | * Merge branch 'lonkaars:dev' into game-engineUnavailableDev2023-03-12
| | | | |\ | | |_|_|/ | |/| | |
| * | | | Merge pull request #32 from heavydemon21/devUnavailableDev2023-03-12
| |\ \ \ \
| | * | | | syntax updateUnavailableDev2023-03-12
| | * | | | drawing map en read from binary complete. shift to background.NielsCoding2023-03-11
| | | | * | integrated palettes and fixed reading tilesUnavailableDev2023-03-12
| | | | * | C:UnavailableDev2023-03-11
| | | | |/
| | | | * Merge branch 'lonkaars:dev' into game-engineUnavailableDev2023-03-11
| | | | |\ | | |_|_|/ | |/| | |
| | | | * gitignore update includes .bin files in home dirUnavailableDev2023-03-11
| | | | |\
| | | | * \ mergeUnavailableDev2023-03-11
| | | | |\ \
| | | | * | | removed TODOUnavailableDev2023-03-10
* | | | | | | Background collisionFlenk0082023-03-13
| |_|/ / / / |/| | | | |
* | | | | | Merge branch 'lonkaars:dev' into devFlenk0082023-03-11
|\| | | | |
| * | | | | Merge pull request #30 from heavydemon21/devUnavailableDev2023-03-11
| |\| | | | | | |_|_|/ | |/| | |
| | * | | makefile engineNielsCoding2023-03-11
| | * | | moved filesNielsCoding2023-03-11
| |/ / /
* | | | Fixed movementFlenk0082023-03-11
* | | | Merge branch 'lonkaars:dev' into devFlenk0082023-03-10
|\| | |
| * | | Merge pull request #27 from UnavailableDev/game-engineUnavailableDev2023-03-10
| |\ \ \ | | | |/ | | |/|
| | * | Update test_file_read.cUnavailableDev2023-03-10
| | * | removed TODOUnavailableDev2023-03-10
| | * | Delete tiles.bsUnavailableDev2023-03-10
| | * | Delete settings.jsonUnavailableDev2023-03-10
| | * | Delete c_cpp_properties.jsonUnavailableDev2023-03-10
| | * | Merge branch 'lonkaars:dev' into game-engineUnavailableDev2023-03-10
| | |\ \ | | |/ / | |/| / | | |/
| * | top.vhdllonkaars2023-03-10
| * | move pinout.md to schematiclonkaars2023-03-10
| | * ppusim read sprites from file and put into vramUnavailableDev2023-03-10
| | * fixed code stylesUnavailableDev2023-03-10
| | * mergeUnavailableDev2023-03-10
| | |\ | | |/ | |/|