aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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
|\ | | | | Game stuff
| * 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
|\ \ \ \ \ | |_|_|_|/ |/| | | | gameloop/bullet/levels
| * | | | snake case/backgroundNielsCoding2023-04-02
| | | | |
| * | | | gameloop/bullet/levelsNielsCoding2023-03-30
|/ / / / | | | | | | | | | | | | | | | | | | | | gameloop moet nog wat gefixt worden. shop moet nog wat art en functie krijgen zefde voor gameover/highscore bullet moet meerdere entityten kunnen doen nu nog alleen gemaakt voor 1. levels moet alleen nog backwords kunnen
| | * | Merge branch 'lonkaars:dev' into devUnavailableDev2023-03-22
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #44 from UnavailableDev/game-engineUnavailableDev2023-03-22
|\ \ \ \ | | |_|/ | |/| | Game engine
| * | | more mergeUnavailableDev2023-03-22
| |\ \ \
| | * \ \ Merge branch 'lonkaars:dev' into game-engineUnavailableDev2023-03-22
| | |\ \ \
| * | \ \ \ Merge branch 'dev' of https://github.com/heavydemon21/avans-arcade into ↵UnavailableDev2023-03-22
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | game-engine
| | * | | | Merge branch 'dev' of https://github.com/heavydemon21/avans-arcade into devheavydemon212023-03-20
| | |\| | |
| | * | | | demo versionheavydemon212023-03-20
| | | | | |
| | * | | | Player-Enemy collisionFlenk0082023-03-15
| | | | | | | | | | | | | | | | | | | | | | | | Added player with enemy collision. Also changed input system to a vector system with friction and gravity. Jump also works. Enemy is 1 stationary object.
| | * | | | 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 ↵Flenk0082023-03-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/Flenk008/avans-arcade into dev"" This reverts commit a9ad8e0a8ac5346108f1e2c1a0bf9360fadc20da.
| | * | | | | | Revert "Background collision"Flenk0082023-03-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e47f7fa198229b8598b8ab03ef8b2483f7c685bc.
| | * | | | | | Revert "Merge branch 'dev' of https://github.com/Flenk008/avans-arcade into dev"Flenk0082023-03-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4f489426e05fb3b296998b17859d8702cc4f37e1, reversing changes made to e47f7fa198229b8598b8ab03ef8b2483f7c685bc.
| | * | | | | | Merge branch 'dev' of https://github.com/Flenk008/avans-arcade into devFlenk0082023-03-13
| | |\ \ \ \ \ \
| | * | | | | | | Background collisionFlenk0082023-03-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added background collision for player and other entities. Added gravity and jump functionailty
| * | | | | | | | 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.md
| * | | | | | | | Update features.mdFlenk0082023-03-15
| | |/ / / / / / | |/| | | | | | | | | | | | | | Added Dubble Jump
* | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TODO game loop: -(startingscreen) read correct indexes -(shop) read correct indexes -gameplay still needs alot with different levels etc.. rest not yet done bullet needs testing and correct PAL and tilemap reading
| * | | | | | | | Merge branch 'dev' of https://github.com/heavydemon21/avans-arcade into devNielsCoding2023-03-15
| |\| | | | | | |