aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'dev' of https://github.com/heavydemon21/avans-arcade into devheavydemon212023-03-20
|\
| * merge #41lonkaars2023-03-16
| |\
| | * Added top level stmBjornMartens2023-03-16
| | * (UNCLEAN) partial merge of #37lonkaars2023-03-15
| | * architecture and designNielsCoding2023-03-15
| | * bobNielsCoding2023-03-15
| | * architecture docuNielsCoding2023-03-15
| | * game loop and bulletNielsCoding2023-03-15
| | * Merge branch 'dev' of https://github.com/heavydemon21/avans-arcade into devNielsCoding2023-03-15
| | |\
| | * | precautionsU-DESKTOP-MR3JJV2\niels2023-03-15
| * | | restructure architecture documentlonkaars2023-03-16
| * | | Merge branch 'doc' of https://github.com/Flenk008/avans-arcade into devlonkaars2023-03-16
| |\ \ \
| | * | | Update architecture.mdFlenk0082023-03-16
| * | | | merge niels docslonkaars2023-03-16
| |/ / /
| * | | Update architecture.mdUnavailableDev2023-03-15
| * | | architecture document updatelonkaars2023-03-15
| | |/ | |/|
* | | demo versionheavydemon212023-03-20
* | | Player-Enemy collisionFlenk0082023-03-15
* | | Merge branch 'dev' of https://github.com/Flenk008/avans-arcade into devFlenk0082023-03-14
|\| |
| * | Merge pull request #36 from UnavailableDev/game-engineUnavailableDev2023-03-14
| |\ \ | | |/ | |/|
| | * added hexdump file structuresUnavailableDev2023-03-14
| |/
* | 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
| | | | |\