aboutsummaryrefslogtreecommitdiff
path: root/src/crepe
Commit message (Collapse)AuthorAge
* merge w/ masterloek/gameLoek Le Blansch9 hours
|\
| * Merge remote-tracking branch 'origin/master' into max/game2Max-00110 hours
| |\
| * | Added shop itemsMax-00110 hours
| | |
* | | `make format`Loek Le Blansch9 hours
| | |
* | | merge w/ masterLoek Le Blansch10 hours
|\ \ \ | | |/ | |/|
| * | `make format`Loek Le Blansch10 hours
| | |
| * | implement sprite replayLoek Le Blansch12 hours
| | |
| * | Revert "implement animator replay"Loek Le Blansch12 hours
| | | | | | | | | | | | This reverts commit 1ef80ecfdc1a70a6ebdd43fed82d0f9d305d63dc.
| * | implement animator replayLoek Le Blansch12 hours
| |/
| * mergedJAROWMR35 hours
| |\
* | \ another merge + WIPLoek Le Blansch34 hours
|\ \ \ | | |/ | |/|
| * | fix AudioSystemmax/gameLoek Le Blansch2 days
| | |
* | | merge + more WIPLoek Le Blansch34 hours
|\ \ \ | | |/ | |/|
| * | mergeJAROWMR3 days
| |\|
| * | Merge branch 'master' of github.com:lonkaars/crepe into jaro/main-menuJAROWMR3 days
| |\ \
| * \ \ Merge branch 'niels/UI' of github.com:lonkaars/crepe into jaro/main-menuJAROWMR3 days
| |\ \ \
| * \ \ \ script speed fixJAROWMR3 days
| |\ \ \ \
| * \ \ \ \ Merge branch 'wouter/buttonScale' of github.com:lonkaars/crepe into ↵JAROWMR3 days
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | jaro/main-menu
| * | | | | | changed game cameraJAROWMR3 days
| | | | | | |
| * | | | | | added grey colorJAROWMR3 days
| | | | | | |
| * | | | | | Merge branch 'master' of github.com:lonkaars/crepe into jaro/main-menuJAROWMR5 days
| |\ \ \ \ \ \
| * \ \ \ \ \ \ mergeJAROWMR5 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 Blansch38 hours
| | | | | | | | | |
* | | | | | | | | | `make format`Loek Le Blansch38 hours
| | | | | | | | | |
* | | | | | | | | | merge masterLoek Le Blansch38 hours
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Deleted commentMax-0013 days
| | | | | | | | | |
| * | | | | | | | | Make formatMax-0013 days
| | | | | | | | | |
| * | | | | | | | | animator fix -_-heavydemon213 days
| | | | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'origin/niels/UI' into max/gameMax-0013 days
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | hotfix used a.col which is not permittedheavydemon213 days
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge pull request #100 from lonkaars/niels/UIMax-0013 days
| |\| | | | | | | | | | | | | | | | | | | | | | | | | AnimatorSystem hotfix
| | * | | | | | | make format with small adjustment systemheavydemon213 days
| | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | fixed AnimatorSystem bug so that it takes delta time instead of elapsed ↵heavydemon213 days
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | time, the Animator api has not been changed
| * | | | | | make formatWBoerenkamps3 days
| | |_|_|_|/ | |/| | | |
| * | | | | bug fixWBoerenkamps3 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
| | | | | | | | | | | | | | | | | | | | beacause otherwise its blurry
| * | | | add world space to text rendering and removedlayers on textheavydemon212024-12-20
| | |/ / | |/| |
* | | | more revertLoek Le Blansch38 hours
| | | |