aboutsummaryrefslogtreecommitdiff
path: root/src/example
Commit message (Expand)AuthorAge
* Merge branch 'master' into niels/UIheavydemon215 days
|\
| * make formatWBoerenkamps5 days
| * feedback changesWBoerenkamps5 days
| * Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/text-c...WBoerenkamps5 days
| |\
| * | small changesWBoerenkamps5 days
| * | readded const and used emplace insteadWBoerenkamps5 days
* | | Merge branch 'master' into niels/UIheavydemon215 days
|\ \ \ | | |/ | |/|
| * | Merge branch 'wouter/inputSystem' of github.com:lonkaars/crepeLoek Le Blansch5 days
| |\ \
| | * | removed large commentWBoerenkamps8 days
| | * | make formatWBoerenkamps8 days
| | * | keyboard state workingWBoerenkamps8 days
| | * | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/inputS...WBoerenkamps8 days
| | |\ \
| | * \ \ Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/inputS...WBoerenkamps10 days
| | |\ \ \
| | * \ \ \ Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/inputS...WBoerenkamps11 days
| | |\ \ \ \
| | * | | | | get_keyboard_state workingWBoerenkamps13 days
* | | | | | | Merge branch 'master' into niels/UIheavydemon215 days
|\| | | | | |
| * | | | | | Merge branch 'jaro/particle-system-improvement' of github.com:lonkaars/crepeLoek Le Blansch5 days
| |\ \ \ \ \ \
| | * | | | | | fixed bug with lower than one particle per secondJAROWMR8 days
| | * | | | | | updated test and game.cppJAROWMR8 days
| | * | | | | | fixed game exampleJAROWMR8 days
| | * | | | | | Merge branch 'master' of github.com:lonkaars/crepe into jaro/particle-system-...JAROWMR8 days
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | * | | | | | make formatJAROWMR9 days
| | * | | | | | updated particle emitterJAROWMR10 days
| | | |_|_|/ / | | |/| | | |
| * | | | | | make formatJAROWMR8 days
| * | | | | | used add force in game.cppJAROWMR8 days
| * | | | | | updated api and gameJAROWMR8 days
| | |/ / / / | |/| | | |
* | | | | | workig rending textheavydemon215 days
* | | | | | Merge branch 'wouter/text-component' into niels/UIheavydemon215 days
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | final changesWBoerenkamps5 days
* | | | | | Merge branch 'wouter/text-component' into niels/UIheavydemon215 days
|\| | | | |
| * | | | | testing somethingWBoerenkamps5 days
| * | | | | text now working with optionalWBoerenkamps5 days
* | | | | | tmp fixheavydemon215 days
* | | | | | Merge branch 'wouter/text-component' into niels/UIheavydemon216 days
|\| | | | |
| * | | | | make formatWBoerenkamps6 days
| * | | | | segmentation fault fixedWBoerenkamps6 days
| * | | | | very illegal commit do not pushWBoerenkamps6 days
| * | | | | added constWBoerenkamps6 days
* | | | | | idkheavydemon216 days
* | | | | | Merge branch 'wouter/text-component' into niels/UIheavydemon216 days
|\| | | | |
| * | | | | retrieving font with resource manager addedWBoerenkamps6 days
* | | | | | fontingheavydemon216 days
|/ / / / /
* | | | | make formatWBoerenkamps6 days
* | | | | font family implemented in the text componentWBoerenkamps6 days
* | | | | make formatWBoerenkamps8 days
* | | | | feedback changesWBoerenkamps8 days
* | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/text-c...WBoerenkamps8 days
|\| | | |
| * | | | Merge branch 'jaro/collision-system' of github.com:lonkaars/crepeLoek Le Blansch8 days
| |\ \ \ \
| | * | | | make formatJAROWMR9 days
| | * | | | multiple bug/feature fixesJAROWMR9 days