aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAge
* 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
| * | | | 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
| | |\| | |
| | | * | | 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
| |\| |
| | * | makefile engineNielsCoding2023-03-11
| | * | moved filesNielsCoding2023-03-11
| | |/
| * / gitignore update includes .bin files in home dirUnavailableDev2023-03-11
| |/
| * Delete settings.jsonUnavailableDev2023-03-10
| * Delete c_cpp_properties.jsonUnavailableDev2023-03-10
| * ppusim read sprites from file and put into vramUnavailableDev2023-03-10