aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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 pull request #36 from UnavailableDev/game-engineUnavailableDev2023-03-14
| |\ | | | | | | added hexdump file structures
| | * added hexdump file structuresUnavailableDev2023-03-14
| |/
* | Merge branch 'dev' of https://github.com/Flenk008/avans-arcade into devFlenk0082023-03-14
|\|
| * Merge pull request #35 from UnavailableDev/game-engineUnavailableDev2023-03-14
| |\ | | | | | | Camera controller
| | * merge?UnavailableDev2023-03-14
| | |\ | | |/ | |/|
| | * camera y-axis bug fixed + clean upUnavailableDev2023-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
|\| |
| * | Merge pull request #28 from UnavailableDev/game-engineUnavailableDev2023-03-13
| |\| | | | | | | Game engine
| | * 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 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
| | | | |\ | | |_|_|/ | |/| | |
| | | | * gitignore update includes .bin files in home dirUnavailableDev2023-03-11
| | | | |\
| | | | * \ mergeUnavailableDev2023-03-11
| | | | |\ \
| | | | * | | removed TODOUnavailableDev2023-03-10
| | | | | | |
* | | | | | | Background collisionFlenk0082023-03-13
| |_|/ / / / |/| | | | | | | | | | | | | | | | | Added background collision for player and other entities. Added gravity and jump functionailty
* | | | | | Merge branch 'lonkaars:dev' into devFlenk0082023-03-11
|\| | | | |
| * | | | | Merge pull request #30 from heavydemon21/devUnavailableDev2023-03-11
| |\| | | | | | |_|_|/ | |/| | | Dev
| | * | | makefile engineNielsCoding2023-03-11
| | | | |
| | * | | moved filesNielsCoding2023-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 pull request #27 from UnavailableDev/game-engineUnavailableDev2023-03-10
| |\ \ \ | | | |/ | | |/| Game engine
| | * | Update test_file_read.cUnavailableDev2023-03-10
| | | |
| | * | removed TODOUnavailableDev2023-03-10
| | | |
| | * | Delete tiles.bsUnavailableDev2023-03-10
| | | |
| | * | Delete settings.jsonUnavailableDev2023-03-10
| | | |
| | * | Delete c_cpp_properties.jsonUnavailableDev2023-03-10
| | | |
| | * | Merge branch 'lonkaars:dev' into game-engineUnavailableDev2023-03-10
| | |\ \ | | |/ / | |/| / | | |/