Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'wouter/text-component' into niels/UI | heavydemon21 | 5 days |
|\ | |||
| * | removed iostream | WBoerenkamps | 5 days |
| | | |||
| * | testing something | WBoerenkamps | 5 days |
| | | |||
| * | text now working with optional | WBoerenkamps | 5 days |
| | | |||
| * | code not working | WBoerenkamps | 5 days |
| | | |||
* | | tmp fix | heavydemon21 | 5 days |
| | | |||
* | | Merge branch 'wouter/text-component' into niels/UI | heavydemon21 | 6 days |
|\| | |||
| * | make format | WBoerenkamps | 6 days |
| | | |||
| * | small changes | WBoerenkamps | 6 days |
| | | |||
| * | segmentation fault fixed | WBoerenkamps | 6 days |
| | | |||
| * | very illegal commit do not push | WBoerenkamps | 6 days |
| | | |||
| * | added const | WBoerenkamps | 6 days |
| | | |||
* | | idk | heavydemon21 | 6 days |
| | | |||
* | | rendersys | heavydemon21 | 6 days |
| | | |||
* | | Merge branch 'wouter/text-component' into niels/UI | heavydemon21 | 6 days |
|\| | |||
| * | retrieving font with resource manager added | WBoerenkamps | 6 days |
| | | |||
* | | fonting | heavydemon21 | 6 days |
|/ | |||
* | make format | WBoerenkamps | 6 days |
| | |||
* | font family implemented in the text component | WBoerenkamps | 6 days |
| | |||
* | headers to c file change | WBoerenkamps | 6 days |
| | |||
* | remove launch | WBoerenkamps | 8 days |
| | |||
* | make format | WBoerenkamps | 8 days |
| | |||
* | feedback changes | WBoerenkamps | 8 days |
| | |||
* | Merge branch 'master' of https://github.com/lonkaars/crepe into ↵ | WBoerenkamps | 8 days |
|\ | | | | | | | wouter/text-component | ||
| * | `make format` | Loek Le Blansch | 8 days |
| | | |||
| * | Merge branch 'master' of github.com:lonkaars/crepe into jaro/collision-system | JAROWMR | 8 days |
| |\ | |||
| | * | fix SceneManagerTest | Loek Le Blansch | 8 days |
| | | | |||
| | * | Merge branch 'jaro/collision-system' of github.com:lonkaars/crepe | Loek Le Blansch | 8 days |
| | |\ | |||
| | * \ | Merge branch 'master' of github.com:lonkaars/crepe into ↵ | JAROWMR | 9 days |
| | |\ \ | | | | | | | | | | | | | | | | jaro/mediator_concealing_scene | ||
| | | * \ | Merge pull request #76 from lonkaars/wouter/gameloop | Wboerenkamps | 9 days |
| | | |\ \ | | | | | | | | | | | | | fps hotfix + regression test | ||
| | | | * | | made test less strict | WBoerenkamps | 9 days |
| | | | | | | |||
| | | | * | | include fix | WBoerenkamps | 10 days |
| | | | | | | |||
| | | | * | | made return unsigned int | WBoerenkamps | 10 days |
| | | | | | | |||
| | | | * | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/gameloop | WBoerenkamps | 10 days |
| | | | |\ \ | |||
| | | | * | | | fps fix + regression test | WBoerenkamps | 10 days |
| | | | | | | | |||
| | | * | | | | bugfix animatorsystem | heavydemon21 | 9 days |
| | | | |/ / | | | |/| | | |||
| | * | | | | make format | JAROWMR | 9 days |
| | | | | | | |||
| | * | | | | moved code to cpp | JAROWMR | 9 days |
| | | | | | | |||
| | * | | | | added scene to cmake | JAROWMR | 9 days |
| | | | | | | |||
| | * | | | | added feedback | JAROWMR | 9 days |
| | | | | | | |||
| | * | | | | moved mediator up | JAROWMR | 9 days |
| | | | | | | |||
| | * | | | | removed merge include | JAROWMR | 10 days |
| | | | | | | |||
| | * | | | | Merge branch 'jaro/mediator_concealing_scene' of github.com:lonkaars/crepe ↵ | JAROWMR | 10 days |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | into jaro/mediator_concealing_scene | ||
| | | * | | | | format | JAROWMR | 10 days |
| | | | | | | | |||
| | * | | | | | fixed includes | JAROWMR | 10 days |
| | |/ / / / | |||
| | * / / / | shielded mediator | JAROWMR | 10 days |
| | |/ / / | |||
| * | | / | updated test values | JAROWMR | 8 days |
| | |_|/ | |/| | | |||
| * | | | removed comment and reverted if | JAROWMR | 9 days |
| | | | | |||
| * | | | fixed bug | JAROWMR | 9 days |
| | | | | |||
| * | | | improved readablity | JAROWMR | 9 days |
| |\ \ \ |