aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge pull request #58 from UnavailableDev/devUnavailableDev2023-04-06
|\
| * Merge branch 'dev' of https://github.com/heavydemon21/avans-arcade into devUnavailableDev2023-04-06
| |\
| | * Merge branch 'lonkaars:dev' into devheavydemon212023-04-05
| | |\ | |_|/ |/| |
* | | Merge pull request #52 from heavydemon21/devUnavailableDev2023-04-04
|\ \ \
| | * | Merge branch 'dev' of https://github.com/heavydemon21/avans-arcade into devUnavailableDev2023-04-05
| | |\|
| | | * enemy and ai, bullets and gameplayNielsCoding2023-04-05
| | |/ | |/|
| | * Merge branch 'dev' of https://github.com/heavydemon21/avans-arcade into devUnavailableDev2023-04-05
| | |\ | | |/ | |/|
| * | 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
|/ /
| * Dynamic tilemap worksUnavailableDev2023-04-05
| * dynamic tilemap integrationUnavailableDev2023-04-04
| * Merge branch 'tilemap-build-system' into devUnavailableDev2023-04-04
| |\
| | * add scripts for converting tiles to separate png images for tilemap editingtilemap-build-systemlonkaars2023-03-23
| | * use sort order in makefile and add air tile at index 0lonkaars2023-03-23
| | * load static/tilemap.bin in ppusimlonkaars2023-03-22
| | * fix endianness in `tilepack` and add `tilemap2png` script for previewing fini...lonkaars2023-03-22
| | * add static makefile targets to main gamefile, and add target to flash static ...lonkaars2023-03-22
| | * tilemap build system donelonkaars2023-03-22
| * | hh_update_sprite is now a void functionUnavailableDev2023-04-03
| * | shop selections doneUnavailableDev2023-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