aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAge
* Merge branch 'master' into niels/gameheavydemon213 days
|\
| * Merge remote-tracking branch 'origin/master' into max/game2Max-0013 days
| |\
| | * `make format`Loek Le Blansch3 days
| | * fix audio unit testLoek Le Blansch3 days
| | * implement sprite replayLoek Le Blansch3 days
| | * Revert "implement animator replay"Loek Le Blansch3 days
| | * implement animator replayLoek Le Blansch3 days
| * | Added shop itemsMax-0013 days
| |/
| * mergedJAROWMR4 days
| |\
* | \ another merge + WIPLoek Le Blansch4 days
|\ \ \ | | |/ | |/|
| * | fix AudioSystemmax/gameLoek Le Blansch5 days
* | | merge + more WIPLoek Le Blansch4 days
|\ \ \ | | |/ | |/|
| * | mergeJAROWMR5 days
| |\|
| * | Merge branch 'master' of github.com:lonkaars/crepe into jaro/main-menuJAROWMR5 days
| |\ \
| * \ \ Merge branch 'niels/UI' of github.com:lonkaars/crepe into jaro/main-menuJAROWMR5 days
| |\ \ \
| * \ \ \ script speed fixJAROWMR5 days
| |\ \ \ \
| * \ \ \ \ Merge branch 'wouter/buttonScale' of github.com:lonkaars/crepe into jaro/main...JAROWMR5 days
| |\ \ \ \ \
| * | | | | | changed game cameraJAROWMR5 days
| * | | | | | added grey colorJAROWMR6 days
| * | | | | | Merge branch 'master' of github.com:lonkaars/crepe into jaro/main-menuJAROWMR8 days
| |\ \ \ \ \ \
| * \ \ \ \ \ \ mergeJAROWMR8 days
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of github.com:lonkaars/crepe into jaro/main-menuJAROWMR2024-12-22
| |\ \ \ \ \ \ \ \
| * | | | | | | | | added menu buttons + scene switchingJAROWMR2024-12-22
| * | | | | | | | | added text to btnJAROWMR2024-12-20
* | | | | | | | | | revert signalcatchLoek Le Blansch4 days
* | | | | | | | | | `make format`Loek Le Blansch4 days
* | | | | | | | | | merge masterLoek Le Blansch4 days
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Deleted commentMax-0015 days
| * | | | | | | | | Make formatMax-0015 days
| * | | | | | | | | animator fix -_-heavydemon215 days
| * | | | | | | | | Merge remote-tracking branch 'origin/niels/UI' into max/gameMax-0015 days
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | hotfix used a.col which is not permittedheavydemon215 days
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge pull request #100 from lonkaars/niels/UIMax-0015 days
| |\| | | | | | |
| | * | | | | | | make format with small adjustment systemheavydemon215 days
| | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | fixed AnimatorSystem bug so that it takes delta time instead of elapsed time,...heavydemon216 days
| | | |_|_|/ / | | |/| | | |
| * | | | | | make formatWBoerenkamps5 days
| | |_|_|_|/ | |/| | | |
| * | | | | bug fixWBoerenkamps5 days
| |/ / / /
| * | | | make formatheavydemon212024-12-24
| * | | | feedbackheavydemon212024-12-24
| * | | | ui fixes for offsetheavydemon212024-12-22
| * | | | make formatheavydemon212024-12-22
| * | | | fixed some includesheavydemon212024-12-22
| * | | | button feedbackheavydemon212024-12-22
| * | | | Merge branch 'master' into niels/UIheavydemon212024-12-22
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | implemented feedbackheavydemon212024-12-21
| * | | | make formatheavydemon212024-12-20
| * | | | moved sdl hint to draw sprites and added another to text with 0 instead of 2 ...heavydemon212024-12-20
| * | | | make formatheavydemon212024-12-20
| * | | | add world space to text rendering and removedlayers on textheavydemon212024-12-20
| | |/ / | |/| |
* | | | more revertLoek Le Blansch4 days