aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'lonkaars:dev' into game-engineUnavailableDev2023-03-22
|\
| * 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
| | |/ | |/|
* | | 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
| | | | | | |
| | | | | | * camera movementUnavailableDev2023-03-12
| | | | | | |
| | | | | | * Merge branch 'game-engine' of https://github.com/UnavailableDev/avans-arcade ↵UnavailableDev2023-03-12
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | into game-engine
| | | | | | | * Merge branch 'lonkaars:dev' into game-engineUnavailableDev2023-03-12
| | | | | | | |\ | |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge pull request #32 from heavydemon21/devUnavailableDev2023-03-12
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | drawing map en read from binary complete. shift to background.
| * | | | | | | 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
| | | | | | |\ | |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge pull request #30 from heavydemon21/devUnavailableDev2023-03-11
|\| | | | | | | |_|_|_|/ / |/| | | | | Dev