aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAge
* rendering hp + stringsUnavailableDev2023-04-06
|
* Merge branch 'dev' of https://github.com/heavydemon21/avans-arcade into devUnavailableDev2023-04-06
|\
* | Merge branch 'dev' of https://github.com/heavydemon21/avans-arcade into devUnavailableDev2023-04-05
|\|
| * enemy and ai, bullets and gameplayNielsCoding2023-04-05
| | | | | | | | ai needs finetuning
* | Merge branch 'dev' of https://github.com/heavydemon21/avans-arcade into devUnavailableDev2023-04-05
|\|
| * bullet/player/enemy/gameplayNielsCoding2023-04-04
| | | | | | | | | | | | | | bullet only needs different directions player is done enemy needs ai(Bjorn) gameplay may need some finetuning
| * multiple bullets and bg collisions.NielsCoding2023-04-03
| |
| * Delete title_screen_letteres_large.hexUnavailableDev2023-04-03
| |
| * Delete title_screen_icon.hexUnavailableDev2023-04-03
| |
| * player controller updateNielsCoding2023-04-03
| |
* | Dynamic tilemap worksUnavailableDev2023-04-05
| |
* | dynamic tilemap integrationUnavailableDev2023-04-04
| | | | | | | | (without pallets)
* | Merge branch 'tilemap-build-system' into devUnavailableDev2023-04-04
|\ \
| * | add scripts for converting tiles to separate png images for tilemap editingtilemap-build-systemlonkaars2023-03-23
| | |
| * | use sort order in makefile and add air tile at index 0lonkaars2023-03-23
| | |
| * | load static/tilemap.bin in ppusimlonkaars2023-03-22
| | |
| * | add static makefile targets to main gamefile, and add target to flash static ↵lonkaars2023-03-22
| | | | | | | | | | | | rom to stm32
| * | tilemap build system donelonkaars2023-03-22
| | |
* | | hh_update_sprite is now a void functionUnavailableDev2023-04-03
| | |
* | | shop selections doneUnavailableDev2023-04-03
| |/ |/|
* | Merge branch 'game-engine' into devUnavailableDev2023-04-03
|\ \
| * | sprite rendering, collision fixUnavailableDev2023-04-03
| | |
| * | shop statemachineUnavailableDev2023-04-03
| | |
| * | misc/cleanupUnavailableDev2023-04-03
| | |
| * | a little clean up of player_controller.cUnavailableDev2023-03-24
| | |
| * | added first pass on animation systemsUnavailableDev2023-03-24
| | |
| * | fixed slime.hexUnavailableDev2023-03-23
| | |
| * | added font.hexUnavailableDev2023-03-23
| | |
| * | added normal slime animationsUnavailableDev2023-03-22
| | |
| * | Animated jumpable slimeUnavailableDev2023-03-22
| |/
* | Merge branch 'dev' of https://github.com/UnavailableDev/avans-arcade into devUnavailableDev2023-04-03
|\ \
| * | snake case/backgroundNielsCoding2023-04-02
| | |
| * | gameloop/bullet/levelsNielsCoding2023-03-30
| |/ | | | | | | | | | | gameloop moet nog wat gefixt worden. shop moet nog wat art en functie krijgen zefde voor gameover/highscore bullet moet meerdere entityten kunnen doen nu nog alleen gemaakt voor 1. levels moet alleen nog backwords kunnen
| * 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