aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* workig rending textheavydemon218 days
|
* Merge branch 'wouter/text-component' into niels/UIheavydemon218 days
|\
| * final changesWBoerenkamps8 days
| |
| * last changesWBoerenkamps8 days
| |
* | merging wouterheavydemon218 days
| |
* | 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 formatWBoerenkamps9 days
| |
| * small changesWBoerenkamps9 days
| |
| * segmentation fault fixedWBoerenkamps9 days
| |
| * very illegal commit do not pushWBoerenkamps9 days
| |
| * added constWBoerenkamps9 days
| |
* | idkheavydemon218 days
| |
* | rendersysheavydemon219 days
| |
* | Merge branch 'wouter/text-component' into niels/UIheavydemon219 days
|\|
| * retrieving font with resource manager addedWBoerenkamps9 days
| |
* | fontingheavydemon219 days
|/
* make formatWBoerenkamps9 days
|
* font family implemented in the text componentWBoerenkamps9 days
|
* headers to c file changeWBoerenkamps9 days
|
* remove launchWBoerenkamps11 days
|
* make formatWBoerenkamps11 days
|
* feedback changesWBoerenkamps11 days
|
* Merge branch 'master' of https://github.com/lonkaars/crepe into ↵WBoerenkamps11 days
|\ | | | | | | wouter/text-component
| * `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 ↵JAROWMR12 days
| | |\ \ | | | | | | | | | | | | | | | jaro/mediator_concealing_scene
| | | * \ Merge pull request #76 from lonkaars/wouter/gameloopWboerenkamps12 days
| | | |\ \ | | | | | | | | | | | | fps hotfix + regression test
| | | | * | made test less strictWBoerenkamps12 days
| | | | | |
| | | | * | include fixWBoerenkamps13 days
| | | | | |
| | | | * | made return unsigned intWBoerenkamps13 days
| | | | | |
| | | | * | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/gameloopWBoerenkamps13 days
| | | | |\ \
| | | | * | | fps fix + regression testWBoerenkamps13 days
| | | | | | |
| | | * | | | bugfix animatorsystemheavydemon2112 days
| | | | |/ / | | | |/| |
| | * | | | make formatJAROWMR12 days
| | | | | |
| | * | | | moved code to cppJAROWMR12 days
| | | | | |
| | * | | | added scene to cmakeJAROWMR12 days
| | | | | |
| | * | | | added feedbackJAROWMR12 days
| | | | | |
| | * | | | moved mediator upJAROWMR12 days
| | | | | |
| | * | | | removed merge includeJAROWMR13 days
| | | | | |
| | * | | | Merge branch 'jaro/mediator_concealing_scene' of github.com:lonkaars/crepe ↵JAROWMR13 days
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into jaro/mediator_concealing_scene
| | | * | | | formatJAROWMR13 days
| | | | | | |
| | * | | | | fixed includesJAROWMR13 days
| | |/ / / /