aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAge
* Merge branch 'wouter/text-component' into niels/UIheavydemon2113 days
|\
| * final changesWBoerenkamps13 days
| * last changesWBoerenkamps13 days
* | merging wouterheavydemon2113 days
* | Merge branch 'wouter/text-component' into niels/UIheavydemon2113 days
|\|
| * removed iostreamWBoerenkamps13 days
| * testing somethingWBoerenkamps13 days
| * text now working with optionalWBoerenkamps13 days
| * code not workingWBoerenkamps13 days
* | tmp fixheavydemon2113 days
* | Merge branch 'wouter/text-component' into niels/UIheavydemon2113 days
|\|
| * make formatWBoerenkamps14 days
| * small changesWBoerenkamps14 days
| * segmentation fault fixedWBoerenkamps14 days
| * very illegal commit do not pushWBoerenkamps14 days
| * added constWBoerenkamps14 days
* | idkheavydemon2113 days
* | rendersysheavydemon2114 days
* | Merge branch 'wouter/text-component' into niels/UIheavydemon2114 days
|\|
| * retrieving font with resource manager addedWBoerenkamps14 days
* | fontingheavydemon2114 days
|/
* make formatWBoerenkamps14 days
* font family implemented in the text componentWBoerenkamps14 days
* headers to c file changeWBoerenkamps14 days
* make formatWBoerenkamps2024-12-14
* feedback changesWBoerenkamps2024-12-14
* Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/text-c...WBoerenkamps2024-12-14
|\
| * `make format`Loek Le Blansch2024-12-14
| * Merge branch 'master' of github.com:lonkaars/crepe into jaro/collision-systemJAROWMR2024-12-14
| |\
| | * fix SceneManagerTestLoek Le Blansch2024-12-14
| | * Merge branch 'jaro/collision-system' of github.com:lonkaars/crepeLoek Le Blansch2024-12-14
| | |\
| | * \ Merge branch 'master' of github.com:lonkaars/crepe into jaro/mediator_conceal...JAROWMR2024-12-13
| | |\ \
| | | * \ Merge pull request #76 from lonkaars/wouter/gameloopWboerenkamps2024-12-13
| | | |\ \
| | | | * | made test less strictWBoerenkamps2024-12-13
| | | | * | include fixWBoerenkamps2024-12-12
| | | | * | made return unsigned intWBoerenkamps2024-12-12
| | | | * | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/gameloopWBoerenkamps2024-12-12
| | | | |\ \
| | | | * | | fps fix + regression testWBoerenkamps2024-12-12
| | | * | | | bugfix animatorsystemheavydemon212024-12-13
| | | | |/ / | | | |/| |
| | * | | | make formatJAROWMR2024-12-13
| | * | | | moved code to cppJAROWMR2024-12-13
| | * | | | added scene to cmakeJAROWMR2024-12-13
| | * | | | added feedbackJAROWMR2024-12-13
| | * | | | moved mediator upJAROWMR2024-12-13
| | * | | | removed merge includeJAROWMR2024-12-12
| | * | | | Merge branch 'jaro/mediator_concealing_scene' of github.com:lonkaars/crepe in...JAROWMR2024-12-12
| | |\ \ \ \
| | | * | | | formatJAROWMR2024-12-12
| | * | | | | fixed includesJAROWMR2024-12-12
| | |/ / / /
| | * / / / shielded mediatorJAROWMR2024-12-12
| | |/ / /
| * | | / updated test valuesJAROWMR2024-12-14
| | |_|/ | |/| |