Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'tilemap-build-system' into dev | UnavailableDev | 2023-04-04 |
|\ | |||
| * | add scripts for converting tiles to separate png images for tilemap editingtilemap-build-system | lonkaars | 2023-03-23 |
| | | |||
| * | use sort order in makefile and add air tile at index 0 | lonkaars | 2023-03-23 |
| | | |||
| * | load static/tilemap.bin in ppusim | lonkaars | 2023-03-22 |
| | | |||
| * | fix endianness in `tilepack` and add `tilemap2png` script for previewing ↵ | lonkaars | 2023-03-22 |
| | | | | | | | | finished tilemap | ||
| * | add static makefile targets to main gamefile, and add target to flash static ↵ | lonkaars | 2023-03-22 |
| | | | | | | | | rom to stm32 | ||
| * | tilemap build system done | lonkaars | 2023-03-22 |
| | | |||
* | | hh_update_sprite is now a void function | UnavailableDev | 2023-04-03 |
| | | |||
* | | shop selections done | UnavailableDev | 2023-04-03 |
| | | |||
* | | Merge pull request #49 from UnavailableDev/dev | UnavailableDev | 2023-04-03 |
|\ \ | | | | | | | Game stuff | ||
| * \ | Merge branch 'game-engine' into dev | UnavailableDev | 2023-04-03 |
| |\ \ | |||
| | * | | sprite rendering, collision fix | UnavailableDev | 2023-04-03 |
| | | | | |||
| | * | | shop statemachine | UnavailableDev | 2023-04-03 |
| | | | | |||
| | * | | misc/cleanup | UnavailableDev | 2023-04-03 |
| | | | | |||
| | * | | a little clean up of player_controller.c | UnavailableDev | 2023-03-24 |
| | | | | |||
| | * | | added first pass on animation systems | UnavailableDev | 2023-03-24 |
| | | | | |||
| | * | | fixed slime.hex | UnavailableDev | 2023-03-23 |
| | | | | |||
| | * | | added font.hex | UnavailableDev | 2023-03-23 |
| | | | | |||
| | * | | added normal slime animations | UnavailableDev | 2023-03-22 |
| | | | | |||
| | * | | updated test/bin/.gitignore | UnavailableDev | 2023-03-22 |
| | | | | |||
| | * | | merge | UnavailableDev | 2023-03-22 |
| | |\| | |||
| | * | | Animated jumpable slime | UnavailableDev | 2023-03-22 |
| | | | | |||
| * | | | Merge branch 'dev' of https://github.com/UnavailableDev/avans-arcade into dev | UnavailableDev | 2023-04-03 |
| |\ \ \ | |||
| | * \ \ | Merge branch 'lonkaars:dev' into dev | UnavailableDev | 2023-04-03 |
| | |\ \ \ | |_|/ / / |/| | | | | |||
* | | | | | Merge pull request #48 from heavydemon21/dev | UnavailableDev | 2023-04-03 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | gameloop/bullet/levels | ||
| * | | | | snake case/background | NielsCoding | 2023-04-02 |
| | | | | | |||
| * | | | | gameloop/bullet/levels | NielsCoding | 2023-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 dev | UnavailableDev | 2023-03-22 |
| | |\ \ | |_|/ / |/| | | | |||
* | | | | Merge pull request #44 from UnavailableDev/game-engine | UnavailableDev | 2023-03-22 |
|\ \ \ \ | | |_|/ | |/| | | Game engine | ||
| * | | | more merge | UnavailableDev | 2023-03-22 |
| |\ \ \ | |||
| | * \ \ | Merge branch 'lonkaars:dev' into game-engine | UnavailableDev | 2023-03-22 |
| | |\ \ \ | |||
| * | \ \ \ | Merge branch 'dev' of https://github.com/heavydemon21/avans-arcade into ↵ | UnavailableDev | 2023-03-22 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | game-engine | ||
| | * | | | | Merge branch 'dev' of https://github.com/heavydemon21/avans-arcade into dev | heavydemon21 | 2023-03-20 |
| | |\| | | | |||
| | * | | | | demo version | heavydemon21 | 2023-03-20 |
| | | | | | | |||
| | * | | | | Player-Enemy collision | Flenk008 | 2023-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 dev | Flenk008 | 2023-03-14 |
| | |\ \ \ \ | |||
| | * \ \ \ \ | Merge branch 'dev' of https://github.com/Flenk008/avans-arcade into dev | Flenk008 | 2023-03-14 |
| | |\ \ \ \ \ | |||
| | * | | | | | | Revert "Revert "Merge branch 'dev' of ↵ | Flenk008 | 2023-03-13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/Flenk008/avans-arcade into dev"" This reverts commit a9ad8e0a8ac5346108f1e2c1a0bf9360fadc20da. | ||
| | * | | | | | | Revert "Background collision" | Flenk008 | 2023-03-13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e47f7fa198229b8598b8ab03ef8b2483f7c685bc. | ||
| | * | | | | | | Revert "Merge branch 'dev' of https://github.com/Flenk008/avans-arcade into dev" | Flenk008 | 2023-03-13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4f489426e05fb3b296998b17859d8702cc4f37e1, reversing changes made to e47f7fa198229b8598b8ab03ef8b2483f7c685bc. | ||
| | * | | | | | | Merge branch 'dev' of https://github.com/Flenk008/avans-arcade into dev | Flenk008 | 2023-03-13 |
| | |\ \ \ \ \ \ | |||
| | * | | | | | | | Background collision | Flenk008 | 2023-03-13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added background collision for player and other entities. Added gravity and jump functionailty | ||
| * | | | | | | | | merge | UnavailableDev | 2023-03-15 |
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | |||
| * | | | | | | | | updated file fetch | UnavailableDev | 2023-03-15 |
| | | | | | | | | | |||
| * | | | | | | | | added title screen | UnavailableDev | 2023-03-15 |
| | | | | | | | | | |||
* | | | | | | | | | Merge pull request #39 from Flenk008/patch-1 | UnavailableDev | 2023-03-22 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | Update features.md | ||
| * | | | | | | | | Update features.md | Flenk008 | 2023-03-15 |
| | |/ / / / / / | |/| | | | | | | | | | | | | | | Added Dubble Jump | ||
* | | | | | | | | merge #41 | lonkaars | 2023-03-16 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | Added top level stm | BjornMartens | 2023-03-16 |
| | | | | | | | | | |||
| * | | | | | | | | (UNCLEAN) partial merge of #37 | lonkaars | 2023-03-15 |
| | | | | | | | | |