aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge pull request #52 from heavydemon21/devUnavailableDev2023-04-04
|\
| * bullet/player/enemy/gameplayNielsCoding2023-04-04
| * multiple bullets and bg collisions.NielsCoding2023-04-03
|/
* Merge pull request #50 from heavydemon21/devUnavailableDev2023-04-03
|\
| * removed nrf from settings.jsonUnavailableDev2023-04-03
| * Delete title_screen_letteres_large.hexUnavailableDev2023-04-03
| * Delete title_screen_icon.hexUnavailableDev2023-04-03
| * player controller updateNielsCoding2023-04-03
|/
* Merge pull request #49 from UnavailableDev/devUnavailableDev2023-04-03
|\
| * Merge branch 'game-engine' into devUnavailableDev2023-04-03
| |\
| | * sprite rendering, collision fixUnavailableDev2023-04-03
| | * shop statemachineUnavailableDev2023-04-03
| | * misc/cleanupUnavailableDev2023-04-03
| | * a little clean up of player_controller.cUnavailableDev2023-03-24
| | * added first pass on animation systemsUnavailableDev2023-03-24
| | * fixed slime.hexUnavailableDev2023-03-23
| | * added font.hexUnavailableDev2023-03-23
| | * added normal slime animationsUnavailableDev2023-03-22
| | * updated test/bin/.gitignoreUnavailableDev2023-03-22
| | * mergeUnavailableDev2023-03-22
| | |\
| | * | Animated jumpable slimeUnavailableDev2023-03-22
| * | | Merge branch 'dev' of https://github.com/UnavailableDev/avans-arcade into devUnavailableDev2023-04-03
| |\ \ \
| | * \ \ Merge branch 'lonkaars:dev' into devUnavailableDev2023-04-03
| | |\ \ \ | |_|/ / / |/| | | |
* | | | | Merge pull request #48 from heavydemon21/devUnavailableDev2023-04-03
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | snake case/backgroundNielsCoding2023-04-02
| * | | | gameloop/bullet/levelsNielsCoding2023-03-30
|/ / / /
| | * | Merge branch 'lonkaars:dev' into devUnavailableDev2023-03-22
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #44 from UnavailableDev/game-engineUnavailableDev2023-03-22
|\ \ \ \ | | |_|/ | |/| |
| * | | more mergeUnavailableDev2023-03-22
| |\ \ \
| | * \ \ Merge branch 'lonkaars:dev' into game-engineUnavailableDev2023-03-22
| | |\ \ \
| * | \ \ \ Merge branch 'dev' of https://github.com/heavydemon21/avans-arcade into game-...UnavailableDev2023-03-22
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge branch 'dev' of https://github.com/heavydemon21/avans-arcade into devheavydemon212023-03-20
| | |\| | |
| | * | | | demo versionheavydemon212023-03-20
| | * | | | Player-Enemy collisionFlenk0082023-03-15
| | * | | | Merge branch 'dev' of https://github.com/Flenk008/avans-arcade into devFlenk0082023-03-14
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'dev' of https://github.com/Flenk008/avans-arcade into devFlenk0082023-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
| | |\ \ \ \ \ \
| | * | | | | | | Background collisionFlenk0082023-03-13
| * | | | | | | | mergeUnavailableDev2023-03-15
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | updated file fetchUnavailableDev2023-03-15
| * | | | | | | | added title screenUnavailableDev2023-03-15
* | | | | | | | | Merge pull request #39 from Flenk008/patch-1UnavailableDev2023-03-22
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Update features.mdFlenk0082023-03-15
| | |/ / / / / / | |/| | | | | |
* | | | | | | | merge #41lonkaars2023-03-16
|\ \ \ \ \ \ \ \
| * | | | | | | | Added top level stmBjornMartens2023-03-16
| * | | | | | | | (UNCLEAN) partial merge of #37lonkaars2023-03-15
| * | | | | | | | architecture and designNielsCoding2023-03-15