aboutsummaryrefslogtreecommitdiff
path: root/src/crepe
Commit message (Collapse)AuthorAge
* Merge branch 'master' into niels/gameheavydemon212025-01-08
|\
| * replay for text componentsloek/replayLoek Le Blansch2025-01-08
| |
* | merge w/ masterLoek Le Blansch2025-01-08
|\|
| * Merge remote-tracking branch 'origin/master' into max/game2Max-0012025-01-08
| |\
| * | Added shop itemsMax-0012025-01-08
| | |
* | | `make format`Loek Le Blansch2025-01-08
| | |
* | | merge w/ masterLoek Le Blansch2025-01-08
|\ \ \ | | |/ | |/|
| * | `make format`Loek Le Blansch2025-01-08
| | |
| * | implement sprite replayLoek Le Blansch2025-01-08
| | |
| * | Revert "implement animator replay"Loek Le Blansch2025-01-08
| | | | | | | | | | | | This reverts commit 1ef80ecfdc1a70a6ebdd43fed82d0f9d305d63dc.
| * | implement animator replayLoek Le Blansch2025-01-08
| |/
| * mergedJAROWMR2025-01-07
| |\
* | \ another merge + WIPLoek Le Blansch2025-01-07
|\ \ \ | | |/ | |/|
| * | fix AudioSystemmax/gameLoek Le Blansch2025-01-06
| | |
* | | merge + more WIPLoek Le Blansch2025-01-07
|\ \ \ | | |/ | |/|
| * | mergeJAROWMR2025-01-06
| |\|
| * | Merge branch 'master' of github.com:lonkaars/crepe into jaro/main-menuJAROWMR2025-01-06
| |\ \
| * \ \ Merge branch 'niels/UI' of github.com:lonkaars/crepe into jaro/main-menuJAROWMR2025-01-06
| |\ \ \
| * \ \ \ script speed fixJAROWMR2025-01-06
| |\ \ \ \
| * \ \ \ \ Merge branch 'wouter/buttonScale' of github.com:lonkaars/crepe into ↵JAROWMR2025-01-06
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | jaro/main-menu
| * | | | | | changed game cameraJAROWMR2025-01-06
| | | | | | |
| * | | | | | added grey colorJAROWMR2025-01-05
| | | | | | |
| * | | | | | Merge branch 'master' of github.com:lonkaars/crepe into jaro/main-menuJAROWMR2025-01-03
| |\ \ \ \ \ \
| * \ \ \ \ \ \ mergeJAROWMR2025-01-03
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ 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 Blansch2025-01-07
| | | | | | | | | |
* | | | | | | | | | `make format`Loek Le Blansch2025-01-07
| | | | | | | | | |
* | | | | | | | | | merge masterLoek Le Blansch2025-01-07
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Deleted commentMax-0012025-01-06
| | | | | | | | | |
| * | | | | | | | | Make formatMax-0012025-01-06
| | | | | | | | | |
| * | | | | | | | | animator fix -_-heavydemon212025-01-06
| | | | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'origin/niels/UI' into max/gameMax-0012025-01-06
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | hotfix used a.col which is not permittedheavydemon212025-01-06
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge pull request #100 from lonkaars/niels/UIMax-0012025-01-06
| |\| | | | | | | | | | | | | | | | | | | | | | | | | AnimatorSystem hotfix
| | * | | | | | | make format with small adjustment systemheavydemon212025-01-06
| | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | fixed AnimatorSystem bug so that it takes delta time instead of elapsed ↵heavydemon212025-01-05
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | time, the Animator api has not been changed
| * | | | | | make formatWBoerenkamps2025-01-06
| | |_|_|_|/ | |/| | | |
| * | | | | bug fixWBoerenkamps2025-01-06
| |/ / / /
| * | | | 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