aboutsummaryrefslogtreecommitdiff
path: root/src/example
Commit message (Expand)AuthorAge
* Fixed collision layersmax-00110 days
* Fix merge issuesmax-00110 days
* Merge remote-tracking branch 'origin/master' into max/gamemax-00110 days
|\
| * merge masterloek/replayLoek Le Blansch10 days
| |\
| | * fixesJAROWMR10 days
| | * updated nanJAROWMR11 days
| | |\
| | | * make formatJAROWMR11 days
| | * | removed collision testJAROWMR11 days
| | |/
| | * merge masterJAROWMR11 days
| | |\
| | | * make formatheavydemon2111 days
| | | * fixed ( placedmentheavydemon2111 days
| | | * Merge branch 'master' into niels/UIheavydemon2111 days
| | | |\
| | | | * Merge branch 'master' into niels/rendering_fixesLoek Le Blansch11 days
| | | | |\
| | | | * | make formatheavydemon2112 days
| | | | * | added particle begin lifespan rendering, added world_space to sprite so that ...heavydemon2112 days
| | | * | | rendering met absoluut position util functie, particle ben ik nog jaro aan he...heavydemon2112 days
| | | * | | added transform scale and rotation in the drawing text componentheavydemon2112 days
| | | * | | Merge branch 'master' into niels/UIheavydemon2113 days
| | | |\| |
| | | * | | Merge branch 'master' into niels/UIheavydemon2113 days
| | | |\ \ \
| | | * \ \ \ Merge branch 'master' into niels/UIheavydemon2113 days
| | | |\ \ \ \
| | | * | | | | workig rending textheavydemon2113 days
| | | * | | | | Merge branch 'wouter/text-component' into niels/UIheavydemon2113 days
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'wouter/text-component' into niels/UIheavydemon2113 days
| | | |\ \ \ \ \ \
| | | * | | | | | | tmp fixheavydemon2113 days
| | | * | | | | | | Merge branch 'wouter/text-component' into niels/UIheavydemon2113 days
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | idkheavydemon2113 days
| | | * | | | | | | | Merge branch 'wouter/text-component' into niels/UIheavydemon2114 days
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | fontingheavydemon2114 days
| | * | | | | | | | | | removed testJAROWMR11 days
| | * | | | | | | | | | updated coments and reverted test cmakeJAROWMR11 days
| | * | | | | | | | | | improved doxygenJAROWMR11 days
| | * | | | | | | | | | tested system, added roation to emitterJAROWMR11 days
| | * | | | | | | | | | fixed bugJAROWMR11 days
| | * | | | | | | | | | bug fix and doxygen fixJAROWMR11 days
| | * | | | | | | | | | testing dynamicJAROWMR12 days
| | * | | | | | | | | | merged detection and resolution functionsJAROWMR12 days
| | * | | | | | | | | | Merge remote-tracking branch 'origin/master' into jaro/collision-system-hande...max-00113 days
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | |
| | * | | | | | | | | | pulled api changeJAROWMR14 days
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | make formatJAROWMR14 days
| | * | | | | | | | | | | Merge branch 'jaro/particle-system-improvement' of github.com:lonkaars/crepe ...JAROWMR14 days
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Added util for positionJAROWMR14 days
| * | | | | | | | | | | | | merge masterLoek Le Blansch12 days
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'master' into loek/scriptsLoek Le Blansch12 days
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | process feedbackLoek Le Blansch12 days
| | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| * | | | | | | | | | | | merge masterLoek Le Blansch12 days
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | make formatWBoerenkamps13 days
| | * | | | | | | | | | | feedback changesWBoerenkamps13 days
| | * | | | | | | | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/text-c...WBoerenkamps13 days
| | |\| | | | | | | | | |
| | * | | | | | | | | | | small changesWBoerenkamps13 days
| | * | | | | | | | | | | readded const and used emplace insteadWBoerenkamps13 days
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |