aboutsummaryrefslogtreecommitdiff
path: root/game/main.cpp
Commit message (Expand)AuthorAge
* Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/game-i...WBoerenkamps4 days
|\
| * improve player responsivenessLoek Le Blansch5 days
* | make formatWBoerenkamps5 days
* | workers during normal sequence workingWBoerenkamps5 days
|/
* Merge remote-tracking branch 'origin/wouter/enemyAI' into niels/gameheavydemon216 days
|\
| * make formatWBoerenkamps6 days
| * battlescript battle won workingWBoerenkamps6 days
| * enemy death workingWBoerenkamps6 days
* | Merge remote-tracking branch 'origin/loek/game' into niels/gameheavydemon216 days
|\ \
| * | WIPLoek Le Blansch6 days
| * | merge + more WIPLoek Le Blansch7 days
| |\ \
| * | | big WIPLoek Le Blansch2024-12-22
* | | | made my code work by adding it to the gamescene,main and configheavydemon216 days
| |_|/ |/| |
* | | Make formatMax-0016 days
| |/ |/|
* | moved and updated filesJAROWMR8 days
* | using new fontJAROWMR2024-12-23
* | added shop scene with backgroundJAROWMR2024-12-23
* | added menu buttons + scene switchingJAROWMR2024-12-22
* | updated cmake and added simple buttonJAROWMR2024-12-20
|/
* finish moving gameLoek Le Blansch2024-12-20
* move game filesLoek Le Blansch2024-12-20
* Fix merge issuesmax-0012024-12-20
* add game folderLoek Le Blansch2024-12-20