aboutsummaryrefslogtreecommitdiff
path: root/src/crepe
Commit message (Expand)AuthorAge
* Merge branch 'wouter/text-component' into niels/UIheavydemon217 days
|\
| * final changesWBoerenkamps7 days
| * last changesWBoerenkamps7 days
* | merging wouterheavydemon217 days
* | Merge branch 'wouter/text-component' into niels/UIheavydemon217 days
|\|
| * removed iostreamWBoerenkamps7 days
| * text now working with optionalWBoerenkamps7 days
| * code not workingWBoerenkamps7 days
* | tmp fixheavydemon217 days
* | Merge branch 'wouter/text-component' into niels/UIheavydemon217 days
|\|
| * make formatWBoerenkamps7 days
| * small changesWBoerenkamps7 days
| * segmentation fault fixedWBoerenkamps7 days
| * very illegal commit do not pushWBoerenkamps7 days
| * added constWBoerenkamps7 days
* | idkheavydemon217 days
* | rendersysheavydemon217 days
* | fontingheavydemon217 days
|/
* make formatWBoerenkamps7 days
* font family implemented in the text componentWBoerenkamps7 days
* headers to c file changeWBoerenkamps7 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 'jaro/collision-system' of github.com:lonkaars/crepeLoek Le Blansch10 days
| |\
| | * removed comment and reverted ifJAROWMR10 days
| | * fixed bugJAROWMR10 days
| | * improved readablityJAROWMR10 days
| | |\
| | | * make formatJAROWMR10 days
| | * | improved readablityJAROWMR10 days
| | |/
| | * reset loopJAROWMR10 days
| | * multiple bug/feature fixesJAROWMR10 days
| * | Merge branch 'master' of github.com:lonkaars/crepe into jaro/mediator_conceal...JAROWMR10 days
| |\ \
| | * \ Merge pull request #76 from lonkaars/wouter/gameloopWboerenkamps10 days
| | |\ \
| | | * | include fixWBoerenkamps11 days
| | | * | made return unsigned intWBoerenkamps11 days
| | | * | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/gameloopWBoerenkamps11 days
| | | |\ \
| | | * | | fps fix + regression testWBoerenkamps11 days
| | * | | | bugfix animatorsystemheavydemon2111 days
| | | |/ / | | |/| |
| * | | | make formatJAROWMR10 days
| * | | | moved code to cppJAROWMR10 days
| * | | | added scene to cmakeJAROWMR10 days
| * | | | added feedbackJAROWMR10 days
| * | | | moved mediator upJAROWMR10 days
| * | | | removed merge includeJAROWMR11 days
| * | | | Merge branch 'jaro/mediator_concealing_scene' of github.com:lonkaars/crepe in...JAROWMR11 days
| |\ \ \ \
| | * | | | formatJAROWMR11 days
| * | | | | fixed includesJAROWMR11 days
| |/ / / /
| * / / / shielded mediatorJAROWMR11 days
| |/ / /