aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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
| |\
| | * 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
| | | |\
| | | * | precautionsU-DESKTOP-MR3JJV2\niels2023-03-15
| | | | |
| | * | | restructure architecture documentlonkaars2023-03-16
| | | | |
| | * | | Merge branch 'doc' of https://github.com/Flenk008/avans-arcade into devlonkaars2023-03-16
| | |\ \ \
| | | * | | Update architecture.mdFlenk0082023-03-16
| | | | | | | | | | | | | | | | | | Added SPI (STM32, BASYS3)
| | * | | | merge niels docslonkaars2023-03-16
| | |/ / /
| | * | | Update architecture.mdUnavailableDev2023-03-15
| | | | |
| | * | | architecture document updatelonkaars2023-03-15
| | | |/ | | |/|
| * | | 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
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge pull request #36 from UnavailableDev/game-engineUnavailableDev2023-03-14
| |\ \ \ \ | | |_|_|/ | |/| | | added hexdump file structures
* | | | | updated file fetchUnavailableDev2023-03-15
| | | | |
* | | | | added title screenUnavailableDev2023-03-15
| |/ / / |/| | |
* | | | added hexdump file structuresUnavailableDev2023-03-14
|/ / /
* | | Merge pull request #35 from UnavailableDev/game-engineUnavailableDev2023-03-14
|\ \ \ | |_|/ |/| | Camera controller
| * | merge?UnavailableDev2023-03-14
| |\ \ | |/ / |/| |
* | | Merge pull request #28 from UnavailableDev/game-engineUnavailableDev2023-03-13
|\ \ \ | | | | | | | | Game engine
| | * | camera y-axis bug fixed + clean upUnavailableDev2023-03-14
| |/ /
| * | Merge branch 'game-engine' of https://github.com/UnavailableDev/avans-arcade ↵UnavailableDev2023-03-13
| |\ \ | | | | | | | | | | | | into game-engine
| | * \ Merge branch 'dev' into game-engineUnavailableDev2023-03-13
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #33 from Flenk008/devUnavailableDev2023-03-13
|\ \ \ \ | | |_|/ | |/| | Fixed Movement of player
| * | | Merge branch 'lonkaars:dev' into devFlenk0082023-03-11
| |\ \ \
| * | | | Fixed movementFlenk0082023-03-11
| | | | | | | | | | | | | | | | | | | | Adjusted movement speed otherwise wouldnt show any movement. Also changed input testing lines so it does work
| * | | | Merge branch 'lonkaars:dev' into devFlenk0082023-03-10
| |\ \ \ \
| * \ \ \ \ Merge branch 'lonkaars:dev' into devFlenk0082023-03-10
| |\ \ \ \ \
| * \ \ \ \ \ Merge pull request #1 from Flenk008/GameLogicFlenk0082023-03-04
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Game logic
| | | | | | | * Merge branch 'lonkaars:dev' into game-engineUnavailableDev2023-03-13
| | | | | | | |\ | |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge pull request #34 from heavydemon21/devUnavailableDev2023-03-13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | features for our game
| * | | | | | | | features voor ons spelNielsCoding2023-03-13
|/ / / / / / / /
| | | | | | * / demo.c clean upUnavailableDev2023-03-13
| | | | | | |/
| | | | | | * demo.cUnavailableDev2023-03-13
| | | | | | |
| | | | | | * camera, movement, collisionsUnavailableDev2023-03-13
| | | | | | |
| | | | | | * makefile updateUnavailableDev2023-03-12
| | | | | | |