| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | 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 |
| | | | | | | | | | |||
| | | * | | | | | | architecture and design | NielsCoding | 2023-03-15 |
| | | | | | | | | | |||
| | | * | | | | | | bob | NielsCoding | 2023-03-15 |
| | | | | | | | | | |||
| | | * | | | | | | architecture docu | NielsCoding | 2023-03-15 |
| | | | | | | | | | |||
| | | * | | | | | | game loop and bullet | NielsCoding | 2023-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 dev | NielsCoding | 2023-03-15 |
| | | |\| | | | | | |||
| | | * | | | | | | precautions | U-DESKTOP-MR3JJV2\niels | 2023-03-15 |
| | | | |_|_|_|/ | | |/| | | | | |||
| | * | | | | | | restructure architecture document | lonkaars | 2023-03-16 |
| | | | | | | | | |||
| | * | | | | | | Merge branch 'doc' of https://github.com/Flenk008/avans-arcade into dev | lonkaars | 2023-03-16 |
| | |\ \ \ \ \ \ | |||
| | | * | | | | | | Update architecture.md | Flenk008 | 2023-03-16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Added SPI (STM32, BASYS3) | ||
| | * | | | | | | | merge niels docs | lonkaars | 2023-03-16 |
| | |/ / / / / / | |||
| | * | | | | | | Update architecture.md | UnavailableDev | 2023-03-15 |
| | | | | | | | | |||
| | * | | | | | | architecture document update | lonkaars | 2023-03-15 |
| | | |/ / / / | |/| | | | | |||
| | * | | | | | Merge pull request #36 from UnavailableDev/game-engine | UnavailableDev | 2023-03-14 |
| | |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | added hexdump file structures | ||
| | | * / / | added hexdump file structures | UnavailableDev | 2023-03-14 |
| | |/ / / | |||
| | * | | | Merge pull request #35 from UnavailableDev/game-engine | UnavailableDev | 2023-03-14 |
| | |\ \ \ | | |_|/ | |/| | | Camera controller | ||
| | | * | | merge? | UnavailableDev | 2023-03-14 |
| | | |\ \ | | |/ / | |/| | | |||
| | * | | | Merge pull request #28 from UnavailableDev/game-engine | UnavailableDev | 2023-03-13 |
| | |\ \ \ | | | | | | | | | | | Game engine | ||
| | | | * | | camera y-axis bug fixed + clean up | UnavailableDev | 2023-03-14 |
| | | |/ / | |||
| | | * | | Merge branch 'game-engine' of https://github.com/UnavailableDev/avans-arcade ↵ | UnavailableDev | 2023-03-13 |
| | | |\ \ | | | | | | | | | | | | | | | | into game-engine | ||
| | | | * \ | Merge branch 'dev' into game-engine | UnavailableDev | 2023-03-13 |
| | | | |\ \ | | |_|/ / | |/| | | | |||
| | * | | | | Merge pull request #33 from Flenk008/dev | UnavailableDev | 2023-03-13 |
| | |\ \ \ \ | | | |_|/ | | |/| | | Fixed Movement of player | ||
| | | * | | | Merge branch 'lonkaars:dev' into dev | Flenk008 | 2023-03-11 |
| | | |\ \ \ | |||
| | | * | | | | Fixed movement | Flenk008 | 2023-03-11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Adjusted movement speed otherwise wouldnt show any movement. Also changed input testing lines so it does work | ||
| | | * | | | | Merge branch 'lonkaars:dev' into dev | Flenk008 | 2023-03-10 |
| | | |\ \ \ \ | |||
| | | * \ \ \ \ | Merge branch 'lonkaars:dev' into dev | Flenk008 | 2023-03-10 |
| | | |\ \ \ \ \ | |||
| | | * \ \ \ \ \ | Merge pull request #1 from Flenk008/GameLogic | Flenk008 | 2023-03-04 |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Game logic | ||
| | | | | | | | | * | Merge branch 'lonkaars:dev' into game-engine | UnavailableDev | 2023-03-13 |
| | | | | | | | | |\ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||