aboutsummaryrefslogtreecommitdiff
path: root/src/example
Commit message (Expand)AuthorAge
* Fix merge issuesmax-00113 days
* Merge remote-tracking branch 'origin/master' into max/gamemax-00113 days
|\
| * merge masterloek/replayLoek Le Blansch13 days
| |\
| | * fixesJAROWMR13 days
| | * updated nanJAROWMR14 days
| | |\
| | | * make formatJAROWMR14 days
| | * | removed collision testJAROWMR14 days
| | |/
| | * merge masterJAROWMR14 days
| | |\
| | | * make formatheavydemon2114 days
| | | * fixed ( placedmentheavydemon2114 days
| | | * Merge branch 'master' into niels/UIheavydemon212024-12-19
| | | |\
| | | | * Merge branch 'master' into niels/rendering_fixesLoek Le Blansch2024-12-19
| | | | |\
| | | | * | make formatheavydemon212024-12-18
| | | | * | added particle begin lifespan rendering, added world_space to sprite so that ...heavydemon212024-12-18
| | | * | | rendering met absoluut position util functie, particle ben ik nog jaro aan he...heavydemon212024-12-18
| | | * | | added transform scale and rotation in the drawing text componentheavydemon212024-12-18
| | | * | | Merge branch 'master' into niels/UIheavydemon212024-12-17
| | | |\| |
| | | * | | Merge branch 'master' into niels/UIheavydemon212024-12-17
| | | |\ \ \
| | | * \ \ \ Merge branch 'master' into niels/UIheavydemon212024-12-17
| | | |\ \ \ \
| | | * | | | | workig rending textheavydemon212024-12-17
| | | * | | | | Merge branch 'wouter/text-component' into niels/UIheavydemon212024-12-17
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'wouter/text-component' into niels/UIheavydemon212024-12-17
| | | |\ \ \ \ \ \
| | | * | | | | | | tmp fixheavydemon212024-12-17
| | | * | | | | | | Merge branch 'wouter/text-component' into niels/UIheavydemon212024-12-17
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | idkheavydemon212024-12-17
| | | * | | | | | | | Merge branch 'wouter/text-component' into niels/UIheavydemon212024-12-16
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | fontingheavydemon212024-12-16
| | * | | | | | | | | | removed testJAROWMR14 days
| | * | | | | | | | | | updated coments and reverted test cmakeJAROWMR14 days
| | * | | | | | | | | | improved doxygenJAROWMR14 days
| | * | | | | | | | | | tested system, added roation to emitterJAROWMR2024-12-19
| | * | | | | | | | | | fixed bugJAROWMR2024-12-19
| | * | | | | | | | | | bug fix and doxygen fixJAROWMR2024-12-19
| | * | | | | | | | | | testing dynamicJAROWMR2024-12-18
| | * | | | | | | | | | merged detection and resolution functionsJAROWMR2024-12-18
| | * | | | | | | | | | Merge remote-tracking branch 'origin/master' into jaro/collision-system-hande...max-0012024-12-17
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | |
| | * | | | | | | | | | pulled api changeJAROWMR2024-12-16
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | make formatJAROWMR2024-12-16
| | * | | | | | | | | | | Merge branch 'jaro/particle-system-improvement' of github.com:lonkaars/crepe ...JAROWMR2024-12-16
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Added util for positionJAROWMR2024-12-16
| * | | | | | | | | | | | | merge masterLoek Le Blansch2024-12-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'master' into loek/scriptsLoek Le Blansch2024-12-18
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | process feedbackLoek Le Blansch2024-12-18
| | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| * | | | | | | | | | | | merge masterLoek Le Blansch2024-12-18
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | make formatWBoerenkamps2024-12-17
| | * | | | | | | | | | | feedback changesWBoerenkamps2024-12-17
| | * | | | | | | | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/text-c...WBoerenkamps2024-12-17
| | |\| | | | | | | | | |
| | * | | | | | | | | | | small changesWBoerenkamps2024-12-17
| | * | | | | | | | | | | readded const and used emplace insteadWBoerenkamps2024-12-17
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| | * | | | | | | | | | final changesWBoerenkamps2024-12-17
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |