aboutsummaryrefslogtreecommitdiff
path: root/src/crepe
Commit message (Expand)AuthorAge
* Merge branch 'master' of github.com:lonkaars/crepe into jaro/main-menuJAROWMR7 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
| * | add world space to text rendering and removedlayers on textheavydemon212024-12-20
* | | mergeJAROWMR7 days
|\ \ \ | | |/ | |/|
| * | update clang-format optionsLoek Le Blansch2024-12-22
| * | `make format`Loek Le Blansch2024-12-22
| * | Merge branch 'max/game' of github.com:lonkaars/crepeLoek Le Blansch2024-12-22
| |\ \
| | * | Added Config.hMax-0012024-12-21
| | * | `make format`Loek Le Blansch2024-12-20
| | |/
* | | Merge branch 'master' of github.com:lonkaars/crepe into jaro/main-menuJAROWMR2024-12-22
|\| |
| * | `make format`Loek Le Blansch2024-12-20
| * | fix EventManager memory leakLoek Le Blansch2024-12-20
| |/
* | added menu buttons + scene switchingJAROWMR2024-12-22
* | added text to btnJAROWMR2024-12-20
|/
* merge masterLoek Le Blansch2024-12-20
|\
| * make formatWBoerenkamps2024-12-20
| * button now using channelWBoerenkamps2024-12-20
* | Make formatmax-0012024-12-20
* | pull 3bda25f from demomax-0012024-12-20
* | Merge remote-tracking branch 'origin/master' into max/gamemax-0012024-12-20
|\|
| * Merge branch 'wouter/relative_ui' of github.com:lonkaars/crepeLoek Le Blansch2024-12-20
| |\
| | * make formatWBoerenkamps2024-12-19
| | * added constWBoerenkamps2024-12-19
| | * merge with masterWBoerenkamps2024-12-19
| | |\
| | * | removed empty if statementWBoerenkamps2024-12-18
| | * | make formatWBoerenkamps2024-12-18
| | * | camera space workingWBoerenkamps2024-12-18
| * | | merge loek/scriptsLoek Le Blansch2024-12-20
| |\ \ \
| | * \ \ Merge branch 'loek/replay' into loek/scriptsloek/scriptsLoek Le Blansch2024-12-19
| | |\ \ \
| | * | | | feedbackLoek Le Blansch2024-12-18
| | * | | | update ScriptSystem doxygenLoek Le Blansch2024-12-18
| | * | | | `make format`Loek Le Blansch2024-12-18
| | * | | | add fixed/frame update functions to scriptLoek Le Blansch2024-12-18
| * | | | | merge masterLoek Le Blansch2024-12-20
| |\ \ \ \ \
| | * | | | | fixesJAROWMR2024-12-20
| | * | | | | make formatJAROWMR2024-12-19
| | * | | | | nan test fixJAROWMR2024-12-19
| | * | | | | updated nanJAROWMR2024-12-19
| | |\ \ \ \ \
| | | * | | | | make formatJAROWMR2024-12-19
| | * | | | | | is_nan fixJAROWMR2024-12-19
| | |/ / / / /
| | * | | | | added doxygenJAROWMR2024-12-19