aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAge
* 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
| * 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
| * | 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 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
| * | Animated jumpable slimeUnavailableDev2023-03-22
| |/
* | Merge branch 'dev' of https://github.com/UnavailableDev/avans-arcade into devUnavailableDev2023-04-03
|\ \
| * | snake case/backgroundNielsCoding2023-04-02
| * | gameloop/bullet/levelsNielsCoding2023-03-30
| |/
| * Merge branch 'dev' of https://github.com/heavydemon21/avans-arcade into game-...UnavailableDev2023-03-22
| |\
| | * 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
| * | | | | updated file fetchUnavailableDev2023-03-15
| * | | | | added title screenUnavailableDev2023-03-15
| | |_|_|/ | |/| | |
| * | | | added hexdump file structuresUnavailableDev2023-03-14
| | |_|/ | |/| |
| * | | camera y-axis bug fixed + clean upUnavailableDev2023-03-14
| | |/ | |/|
| * | 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 devFlenk0082023-03-11
| | | | |\
| | | | * | Fixed movementFlenk0082023-03-11
| * | | | | demo.c clean upUnavailableDev2023-03-13
| |/ / / /
| * | | | demo.cUnavailableDev2023-03-13