aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAge
* Merge branch 'wouter/text-component' into niels/UIheavydemon218 days
|\
| * removed iostreamWBoerenkamps8 days
| * testing somethingWBoerenkamps8 days
| * text now working with optionalWBoerenkamps8 days
| * code not workingWBoerenkamps8 days
* | tmp fixheavydemon218 days
* | Merge branch 'wouter/text-component' into niels/UIheavydemon218 days
|\|
| * make formatWBoerenkamps8 days
| * small changesWBoerenkamps8 days
| * segmentation fault fixedWBoerenkamps8 days
| * very illegal commit do not pushWBoerenkamps8 days
| * added constWBoerenkamps8 days
* | idkheavydemon218 days
* | rendersysheavydemon218 days
* | Merge branch 'wouter/text-component' into niels/UIheavydemon218 days
|\|
| * retrieving font with resource manager addedWBoerenkamps8 days
* | fontingheavydemon218 days
|/
* make formatWBoerenkamps8 days
* font family implemented in the text componentWBoerenkamps8 days
* headers to c file changeWBoerenkamps8 days
* make formatWBoerenkamps11 days
* feedback changesWBoerenkamps11 days
* Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/text-c...WBoerenkamps11 days
|\
| * `make format`Loek Le Blansch11 days
| * Merge branch 'master' of github.com:lonkaars/crepe into jaro/collision-systemJAROWMR11 days
| |\
| | * fix SceneManagerTestLoek Le Blansch11 days
| | * Merge branch 'jaro/collision-system' of github.com:lonkaars/crepeLoek Le Blansch11 days
| | |\
| | * \ Merge branch 'master' of github.com:lonkaars/crepe into jaro/mediator_conceal...JAROWMR11 days
| | |\ \
| | | * \ Merge pull request #76 from lonkaars/wouter/gameloopWboerenkamps11 days
| | | |\ \
| | | | * | made test less strictWBoerenkamps12 days
| | | | * | include fixWBoerenkamps12 days
| | | | * | made return unsigned intWBoerenkamps12 days
| | | | * | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/gameloopWBoerenkamps12 days
| | | | |\ \
| | | | * | | fps fix + regression testWBoerenkamps12 days
| | | * | | | bugfix animatorsystemheavydemon2112 days
| | | | |/ / | | | |/| |
| | * | | | make formatJAROWMR11 days
| | * | | | moved code to cppJAROWMR11 days
| | * | | | added scene to cmakeJAROWMR11 days
| | * | | | added feedbackJAROWMR11 days
| | * | | | moved mediator upJAROWMR11 days
| | * | | | removed merge includeJAROWMR12 days
| | * | | | Merge branch 'jaro/mediator_concealing_scene' of github.com:lonkaars/crepe in...JAROWMR12 days
| | |\ \ \ \
| | | * | | | formatJAROWMR12 days
| | * | | | | fixed includesJAROWMR12 days
| | |/ / / /
| | * / / / shielded mediatorJAROWMR12 days
| | |/ / /
| * | | / updated test valuesJAROWMR11 days
| | |_|/ | |/| |
| * | | removed comment and reverted ifJAROWMR11 days
| * | | fixed bugJAROWMR11 days
| * | | improved readablityJAROWMR11 days
| |\ \ \
| | * | | make formatJAROWMR11 days