aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAge
* Merge branch 'dev' of https://github.com/heavydemon21/avans-arcade into ↵UnavailableDev2023-03-22
|\ | | | | | | game-engine
| * 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
* | | | | updated file fetchUnavailableDev2023-03-15
| | | | |
* | | | | added title screenUnavailableDev2023-03-15
| |_|_|/ |/| | |
* | | | added hexdump file structuresUnavailableDev2023-03-14
| |_|/ |/| |
* | | 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
* | | | | 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
| |\| | |
| | * | | 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
|\| |
| * | makefile engineNielsCoding2023-03-11
| | |
| * | moved filesNielsCoding2023-03-11
| |/
* / gitignore update includes .bin files in home dirUnavailableDev2023-03-11
|/
* Delete settings.jsonUnavailableDev2023-03-10
|
* Delete c_cpp_properties.jsonUnavailableDev2023-03-10
|
* ppusim read sprites from file and put into vramUnavailableDev2023-03-10
|
* fixed code stylesUnavailableDev2023-03-10
|
* mergeUnavailableDev2023-03-10
|\
| * `clang-format`lonkaars2023-03-10
| |
| * add input emulation to test collisionlonkaars2023-03-10
| |
| * initial merge of #26lonkaars2023-03-10
| |
* | Merge branch 'game-engine' of https://github.com/UnavailableDev/avans-arcade ↵UnavailableDev2023-03-10
|\| | | | | | | into game-engine
| * added define for fixed point mathsUnavailableDev2023-03-10
| |
| * codeUnavailableDev2023-03-10
| |
* | nopeUnavailableDev2023-03-10
| |
* | spelling correctionUnavailableDev2023-03-08
|/
* Merge pull request #22 from UnavailableDev/engineUnavailableDev2023-03-08
|\ | | | | Engine
| * more todo'sUnavailableDev2023-03-08
| |
| * some func defenitions for game-engine and foundationUnavailableDev2023-03-07
| |