aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)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 pushWBoerenkamps7 days
| |
| * added constWBoerenkamps7 days
| |
* | idkheavydemon216 days
| |
* | rendersysheavydemon217 days
| |
* | Merge branch 'wouter/text-component' into niels/UIheavydemon217 days
|\|
| * retrieving font with resource manager addedWBoerenkamps7 days
| |
* | fontingheavydemon217 days
|/
* make formatWBoerenkamps7 days
|
* font family implemented in the text componentWBoerenkamps7 days
|
* headers to c file changeWBoerenkamps7 days
|
* make formatWBoerenkamps9 days
|
* feedback changesWBoerenkamps9 days
|
* Merge branch 'master' of https://github.com/lonkaars/crepe into ↵WBoerenkamps9 days
|\ | | | | | | wouter/text-component
| * `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 ↵JAROWMR10 days
| | |\ \ | | | | | | | | | | | | | | | jaro/mediator_concealing_scene
| | | * \ Merge pull request #76 from lonkaars/wouter/gameloopWboerenkamps10 days
| | | |\ \ | | | | | | | | | | | | fps hotfix + regression test
| | | | * | made test less strictWBoerenkamps10 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 animatorsystemheavydemon2110 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 ↵JAROWMR11 days
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into jaro/mediator_concealing_scene
| | | * | | | formatJAROWMR11 days
| | | | | | |
| | * | | | | fixed includesJAROWMR11 days
| | |/ / / /
| | * / / / shielded mediatorJAROWMR11 days
| | |/ / /
| * | | / updated test valuesJAROWMR9 days
| | |_|/ | |/| |
| * | | removed comment and reverted ifJAROWMR10 days
| | | |
| * | | fixed bugJAROWMR10 days
| | | |
| * | | improved readablityJAROWMR10 days
| |\ \ \