aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
* | | | | | | | | | | | | | merging wouterheavydemon217 days
* | | | | | | | | | | | | | Merge branch 'wouter/text-component' into niels/UIheavydemon217 days
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | removed iostreamWBoerenkamps7 days
| * | | | | | | | | | | | | testing somethingWBoerenkamps7 days
| * | | | | | | | | | | | | text now working with optionalWBoerenkamps7 days
| * | | | | | | | | | | | | code not workingWBoerenkamps7 days
* | | | | | | | | | | | | | tmp fixheavydemon217 days
* | | | | | | | | | | | | | Merge branch 'wouter/text-component' into niels/UIheavydemon217 days
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | make formatWBoerenkamps8 days
| * | | | | | | | | | | | | small changesWBoerenkamps8 days
| * | | | | | | | | | | | | segmentation fault fixedWBoerenkamps8 days
| * | | | | | | | | | | | | very illegal commit do not pushWBoerenkamps8 days
| * | | | | | | | | | | | | added constWBoerenkamps8 days
* | | | | | | | | | | | | | idkheavydemon217 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
* | | | | | | | | | | | | remove launchWBoerenkamps10 days
* | | | | | | | | | | | | make formatWBoerenkamps10 days
* | | | | | | | | | | | | feedback changesWBoerenkamps10 days
* | | | | | | | | | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/text-c...WBoerenkamps10 days
|\| | | | | | | | | | | |
| * | | | | | | | | | | | `make format`Loek Le Blansch10 days
| * | | | | | | | | | | | Merge branch 'master' of github.com:lonkaars/crepe into jaro/collision-systemJAROWMR10 days
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| | * | | | | | | | | | | fix SceneManagerTestLoek Le Blansch10 days
| | * | | | | | | | | | | Merge branch 'jaro/collision-system' of github.com:lonkaars/crepeLoek Le Blansch10 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 strictWBoerenkamps11 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 animatorsystemheavydemon2111 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 valuesJAROWMR10 days
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | removed comment and reverted ifJAROWMR11 days
| * | | | | | | | | | | fixed bugJAROWMR11 days