aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAge
* merge + more WIPLoek Le Blansch3 days
|\
| * mergeJAROWMR4 days
| |\
| * \ Merge branch 'master' of github.com:lonkaars/crepe into jaro/main-menuJAROWMR4 days
| |\ \
| * \ \ Merge branch 'niels/UI' of github.com:lonkaars/crepe into jaro/main-menuJAROWMR4 days
| |\ \ \
| * \ \ \ script speed fixJAROWMR4 days
| |\ \ \ \
| * \ \ \ \ Merge branch 'wouter/buttonScale' of github.com:lonkaars/crepe into jaro/main...JAROWMR4 days
| |\ \ \ \ \
| * | | | | | changed game cameraJAROWMR4 days
| * | | | | | added grey colorJAROWMR5 days
| * | | | | | Merge branch 'master' of github.com:lonkaars/crepe into jaro/main-menuJAROWMR7 days
| |\ \ \ \ \ \
| * \ \ \ \ \ \ mergeJAROWMR7 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 Blansch3 days
* | | | | | | | | | `make format`Loek Le Blansch3 days
* | | | | | | | | | merge masterLoek Le Blansch3 days
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Deleted commentMax-0014 days
| * | | | | | | | | Make formatMax-0014 days
| * | | | | | | | | animator fix -_-heavydemon214 days
| * | | | | | | | | Merge remote-tracking branch 'origin/niels/UI' into max/gameMax-0014 days
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | hotfix used a.col which is not permittedheavydemon214 days
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge pull request #100 from lonkaars/niels/UIMax-0014 days
| |\| | | | | | |
| | * | | | | | | make format with small adjustment systemheavydemon214 days
| | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | fixed AnimatorSystem bug so that it takes delta time instead of elapsed time,...heavydemon215 days
| | | |_|_|/ / | | |/| | | |
| * | | | | | make formatWBoerenkamps4 days
| | |_|_|_|/ | |/| | | |
| * | | | | bug fixWBoerenkamps4 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 Blansch3 days
* | | | partially revert engineLoek Le Blansch3 days
* | | | `make format`Loek Le Blansch3 days
* | | | place zapper methodLoek Le Blansch4 days
* | | | revert AnimatorLoek Le Blansch4 days
* | | | `make format`Loek Le Blansch2024-12-22
* | | | more WIP zapperLoek Le Blansch2024-12-22
* | | | reset BehaviorScript to masterLoek Le Blansch2024-12-22
* | | | fix Player prefabLoek Le Blansch2024-12-22
* | | | big WIPLoek Le Blansch2024-12-22
| |/ / |/| |
* | | update clang-format optionsLoek Le Blansch2024-12-22
* | | `make format`Loek Le Blansch2024-12-22