aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'wouter/text-component' into niels/UIheavydemon215 days
|\
| * final changesWBoerenkamps5 days
| * last changesWBoerenkamps5 days
* | merging wouterheavydemon215 days
* | Merge branch 'wouter/text-component' into niels/UIheavydemon215 days
|\|
| * removed iostreamWBoerenkamps5 days
| * testing somethingWBoerenkamps5 days
| * text now working with optionalWBoerenkamps5 days
| * code not workingWBoerenkamps5 days
* | tmp fixheavydemon215 days
* | Merge branch 'wouter/text-component' into niels/UIheavydemon215 days
|\|
| * make formatWBoerenkamps5 days
| * small changesWBoerenkamps5 days
| * segmentation fault fixedWBoerenkamps5 days
| * very illegal commit do not pushWBoerenkamps5 days
| * added constWBoerenkamps5 days
* | idkheavydemon215 days
* | rendersysheavydemon215 days
* | Merge branch 'wouter/text-component' into niels/UIheavydemon215 days
|\|
| * retrieving font with resource manager addedWBoerenkamps5 days
* | fontingheavydemon215 days
|/
* make formatWBoerenkamps5 days
* font family implemented in the text componentWBoerenkamps5 days
* headers to c file changeWBoerenkamps5 days
* remove launchWBoerenkamps7 days
* make formatWBoerenkamps7 days
* feedback changesWBoerenkamps7 days
* Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/text-c...WBoerenkamps7 days
|\
| * `make format`Loek Le Blansch8 days
| * Merge branch 'master' of github.com:lonkaars/crepe into jaro/collision-systemJAROWMR8 days
| |\
| | * fix SceneManagerTestLoek Le Blansch8 days
| | * Merge branch 'jaro/collision-system' of github.com:lonkaars/crepeLoek Le Blansch8 days
| | |\
| | * \ Merge branch 'master' of github.com:lonkaars/crepe into jaro/mediator_conceal...JAROWMR8 days
| | |\ \
| | | * \ Merge pull request #76 from lonkaars/wouter/gameloopWboerenkamps8 days
| | | |\ \
| | | | * | made test less strictWBoerenkamps8 days
| | | | * | include fixWBoerenkamps9 days
| | | | * | made return unsigned intWBoerenkamps9 days
| | | | * | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/gameloopWBoerenkamps9 days
| | | | |\ \
| | | | * | | fps fix + regression testWBoerenkamps9 days
| | | * | | | bugfix animatorsystemheavydemon219 days
| | | | |/ / | | | |/| |
| | * | | | make formatJAROWMR8 days
| | * | | | moved code to cppJAROWMR8 days
| | * | | | added scene to cmakeJAROWMR8 days
| | * | | | added feedbackJAROWMR8 days
| | * | | | moved mediator upJAROWMR8 days
| | * | | | removed merge includeJAROWMR9 days
| | * | | | Merge branch 'jaro/mediator_concealing_scene' of github.com:lonkaars/crepe in...JAROWMR9 days
| | |\ \ \ \
| | | * | | | formatJAROWMR9 days
| | * | | | | fixed includesJAROWMR9 days
| | |/ / / /
| | * / / / shielded mediatorJAROWMR9 days
| | |/ / /