aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAge
* merge master into loek/doxygenLoek Le Blansch4 days
|\
| * Bug fixesMax-0015 days
| * Merge branch 'master' into niels/gameheavydemon217 days
| |\
| | * replay for text componentsloek/replayLoek Le Blansch7 days
| * | merge w/ masterLoek Le Blansch7 days
| |\|
| | * Merge remote-tracking branch 'origin/master' into max/game2Max-0017 days
| | |\
| | * | Added shop itemsMax-0017 days
| * | | `make format`Loek Le Blansch7 days
| * | | merge w/ masterLoek Le Blansch7 days
| |\ \ \ | | | |/ | | |/|
| | * | `make format`Loek Le Blansch7 days
| | * | fix audio unit testLoek Le Blansch7 days
| | * | implement sprite replayLoek Le Blansch7 days
| | * | Revert "implement animator replay"Loek Le Blansch7 days
| | * | implement animator replayLoek Le Blansch7 days
| | |/
| | * mergedJAROWMR8 days
| | |\
| * | \ another merge + WIPLoek Le Blansch8 days
| |\ \ \ | | | |/ | | |/|
| | * | fix AudioSystemmax/gameLoek Le Blansch9 days
| * | | merge + more WIPLoek Le Blansch8 days
| |\ \ \ | | | |/ | | |/|
| | * | mergeJAROWMR9 days
| | |\|
| | * | Merge branch 'master' of github.com:lonkaars/crepe into jaro/main-menuJAROWMR9 days
| | |\ \
| | * \ \ Merge branch 'niels/UI' of github.com:lonkaars/crepe into jaro/main-menuJAROWMR9 days
| | |\ \ \
| | * \ \ \ script speed fixJAROWMR9 days
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'wouter/buttonScale' of github.com:lonkaars/crepe into jaro/main...JAROWMR9 days
| | |\ \ \ \ \
| | * | | | | | changed game cameraJAROWMR9 days
| | * | | | | | added grey colorJAROWMR10 days
| | * | | | | | Merge branch 'master' of github.com:lonkaars/crepe into jaro/main-menuJAROWMR12 days
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ mergeJAROWMR12 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 Blansch8 days
| * | | | | | | | | | `make format`Loek Le Blansch8 days
| * | | | | | | | | | merge masterLoek Le Blansch8 days
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | * | | | | | | | | Deleted commentMax-0019 days
| | * | | | | | | | | Make formatMax-0019 days
| | * | | | | | | | | animator fix -_-heavydemon219 days
| | * | | | | | | | | Merge remote-tracking branch 'origin/niels/UI' into max/gameMax-0019 days
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | | * | | | | | | | hotfix used a.col which is not permittedheavydemon219 days
| | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | * | | | | | | | Merge pull request #100 from lonkaars/niels/UIMax-0019 days
| | |\| | | | | | |
| | | * | | | | | | make format with small adjustment systemheavydemon219 days
| | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | fixed AnimatorSystem bug so that it takes delta time instead of elapsed time,...heavydemon2110 days
| | | | |_|_|/ / | | | |/| | | |
| | * | | | | | make formatWBoerenkamps9 days
| | | |_|_|_|/ | | |/| | | |
| | * | | | | bug fixWBoerenkamps9 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
| | |\ \ \ \ | | | | |_|/ | | | |/| |