aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAge
* merging wouterheavydemon216 days
* Merge branch 'wouter/text-component' into niels/UIheavydemon216 days
|\
| * removed iostreamWBoerenkamps6 days
| * testing somethingWBoerenkamps6 days
| * text now working with optionalWBoerenkamps6 days
| * code not workingWBoerenkamps6 days
* | tmp fixheavydemon216 days
* | Merge branch 'wouter/text-component' into niels/UIheavydemon216 days
|\|
| * make formatWBoerenkamps6 days
| * small changesWBoerenkamps6 days
| * segmentation fault fixedWBoerenkamps6 days
| * very illegal commit do not pushWBoerenkamps6 days
| * added constWBoerenkamps6 days
* | idkheavydemon216 days
* | rendersysheavydemon216 days
* | Merge branch 'wouter/text-component' into niels/UIheavydemon216 days
|\|
| * retrieving font with resource manager addedWBoerenkamps6 days
* | fontingheavydemon216 days
|/
* make formatWBoerenkamps6 days
* font family implemented in the text componentWBoerenkamps6 days
* headers to c file changeWBoerenkamps6 days
* make formatWBoerenkamps9 days
* feedback changesWBoerenkamps9 days
* Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/text-c...WBoerenkamps9 days
|\
| * `make format`Loek Le Blansch9 days
| * Merge branch 'master' of github.com:lonkaars/crepe into jaro/collision-systemJAROWMR9 days
| |\
| | * fix SceneManagerTestLoek Le Blansch9 days
| | * Merge branch 'jaro/collision-system' of github.com:lonkaars/crepeLoek Le Blansch9 days
| | |\
| | * \ Merge branch 'master' of github.com:lonkaars/crepe into jaro/mediator_conceal...JAROWMR9 days
| | |\ \
| | | * \ Merge pull request #76 from lonkaars/wouter/gameloopWboerenkamps10 days
| | | |\ \
| | | | * | made test less strictWBoerenkamps10 days
| | | | * | include fixWBoerenkamps10 days
| | | | * | made return unsigned intWBoerenkamps10 days
| | | | * | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/gameloopWBoerenkamps10 days
| | | | |\ \
| | | | * | | fps fix + regression testWBoerenkamps10 days
| | | * | | | bugfix animatorsystemheavydemon2110 days
| | | | |/ / | | | |/| |
| | * | | | make formatJAROWMR9 days
| | * | | | moved code to cppJAROWMR9 days
| | * | | | added scene to cmakeJAROWMR9 days
| | * | | | added feedbackJAROWMR9 days
| | * | | | moved mediator upJAROWMR10 days
| | * | | | removed merge includeJAROWMR10 days
| | * | | | Merge branch 'jaro/mediator_concealing_scene' of github.com:lonkaars/crepe in...JAROWMR10 days
| | |\ \ \ \
| | | * | | | formatJAROWMR10 days
| | * | | | | fixed includesJAROWMR10 days
| | |/ / / /
| | * / / / shielded mediatorJAROWMR10 days
| | |/ / /
| * | | / updated test valuesJAROWMR9 days
| | |_|/ | |/| |
| * | | removed comment and reverted ifJAROWMR9 days
| * | | fixed bugJAROWMR9 days
| * | | improved readablityJAROWMR9 days
| |\ \ \