aboutsummaryrefslogtreecommitdiff
path: root/src/example
Commit message (Expand)AuthorAge
* merge masterLoek Le Blansch3 days
|\
| * make formatWBoerenkamps4 days
| * feedback changesWBoerenkamps4 days
| * Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/text-c...WBoerenkamps4 days
| |\
| * | small changesWBoerenkamps4 days
| * | readded const and used emplace insteadWBoerenkamps4 days
| * | final changesWBoerenkamps4 days
| * | testing somethingWBoerenkamps4 days
| * | text now working with optionalWBoerenkamps4 days
| * | make formatWBoerenkamps5 days
| * | segmentation fault fixedWBoerenkamps5 days
| * | very illegal commit do not pushWBoerenkamps5 days
| * | added constWBoerenkamps5 days
| * | retrieving font with resource manager addedWBoerenkamps5 days
| * | make formatWBoerenkamps5 days
| * | font family implemented in the text componentWBoerenkamps5 days
| * | make formatWBoerenkamps7 days
| * | feedback changesWBoerenkamps7 days
| * | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/text-c...WBoerenkamps7 days
| |\ \
| * | | sdl_ttf to submodules + feedback changesWBoerenkamps7 days
| * | | added small check to the exampleWBoerenkamps9 days
| * | | make formatWBoerenkamps9 days
| * | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/text-c...WBoerenkamps9 days
| |\ \ \
| * | | | font workingWBoerenkamps9 days
| * | | | load font almost workingWBoerenkamps9 days
| * | | | text component pretty much finishedWBoerenkamps10 days
| * | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/text-c...WBoerenkamps10 days
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/text-c...WBoerenkamps10 days
| |\ \ \ \ \
| * \ \ \ \ \ font progressWBoerenkamps11 days
| |\ \ \ \ \ \
| * | | | | | | font progressWBoerenkamps11 days
* | | | | | | | merge masterLoek Le Blansch4 days
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge branch 'wouter/inputSystem' of github.com:lonkaars/crepeLoek Le Blansch4 days
| |\ \ \ \ \ \ \
| | * | | | | | | removed large commentWBoerenkamps7 days
| | * | | | | | | make formatWBoerenkamps7 days
| | * | | | | | | keyboard state workingWBoerenkamps7 days
| | * | | | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/inputS...WBoerenkamps7 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...WBoerenkamps9 days
| | |\ \ \ \ \ \ \
| | * | | | | | | | get_keyboard_state workingWBoerenkamps12 days
| * | | | | | | | | Merge branch 'jaro/particle-system-improvement' of github.com:lonkaars/crepeLoek Le Blansch4 days
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | fixed bug with lower than one particle per secondJAROWMR7 days
| | * | | | | | | | | updated test and game.cppJAROWMR7 days
| | * | | | | | | | | fixed game exampleJAROWMR7 days
| | * | | | | | | | | Merge branch 'master' of github.com:lonkaars/crepe into jaro/particle-system-...JAROWMR7 days
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |
| | * | | | | | | | | make formatJAROWMR8 days
| | * | | | | | | | | updated particle emitterJAROWMR9 days
| | | |_|_|/ / / / / | | |/| | | | | | |
| * | | | | | | | | make formatJAROWMR7 days
| * | | | | | | | | used add force in game.cppJAROWMR7 days
| * | | | | | | | | updated api and gameJAROWMR7 days
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'master' into loek/replayLoek Le Blansch7 days
|\| | | | | | | |