aboutsummaryrefslogtreecommitdiff
path: root/src/example
Commit message (Expand)AuthorAge
* merge masterJAROWMR2 days
|\
| * make formatheavydemon212 days
| * fixed ( placedmentheavydemon212 days
| * Merge branch 'master' into niels/UIheavydemon212 days
| |\
| | * Merge branch 'master' into niels/rendering_fixesLoek Le Blansch2 days
| | |\
| | | * Merge branch 'master' into loek/scriptsLoek Le Blansch3 days
| | | |\
| | | * | process feedbackLoek Le Blansch3 days
| | * | | make formatheavydemon213 days
| | * | | added particle begin lifespan rendering, added world_space to sprite so that ...heavydemon213 days
| | | |/ | | |/|
| * | | rendering met absoluut position util functie, particle ben ik nog jaro aan he...heavydemon213 days
| * | | added transform scale and rotation in the drawing text componentheavydemon213 days
| * | | Merge branch 'master' into niels/UIheavydemon214 days
| |\| |
| * | | Merge branch 'master' into niels/UIheavydemon214 days
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'master' into niels/UIheavydemon214 days
| |\ \ \
| * | | | workig rending textheavydemon214 days
| * | | | Merge branch 'wouter/text-component' into niels/UIheavydemon214 days
| |\ \ \ \
| * \ \ \ \ Merge branch 'wouter/text-component' into niels/UIheavydemon214 days
| |\ \ \ \ \
| * | | | | | tmp fixheavydemon214 days
| * | | | | | Merge branch 'wouter/text-component' into niels/UIheavydemon214 days
| |\ \ \ \ \ \
| * | | | | | | idkheavydemon214 days
| * | | | | | | Merge branch 'wouter/text-component' into niels/UIheavydemon215 days
| |\ \ \ \ \ \ \
| * | | | | | | | fontingheavydemon215 days
* | | | | | | | | removed testJAROWMR2 days
* | | | | | | | | updated coments and reverted test cmakeJAROWMR2 days
* | | | | | | | | improved doxygenJAROWMR2 days
* | | | | | | | | tested system, added roation to emitterJAROWMR2 days
* | | | | | | | | fixed bugJAROWMR2 days
* | | | | | | | | bug fix and doxygen fixJAROWMR2 days
* | | | | | | | | testing dynamicJAROWMR3 days
* | | | | | | | | merged detection and resolution functionsJAROWMR3 days
* | | | | | | | | Merge remote-tracking branch 'origin/master' into jaro/collision-system-hande...max-0014 days
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | make formatWBoerenkamps4 days
| * | | | | | | | feedback changesWBoerenkamps4 days
| * | | | | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/text-c...WBoerenkamps4 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
| | |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | 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