Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into max/game | max-001 | 2 days |
|\ | |||
| * | merge masterloek/replay | Loek Le Blansch | 2 days |
| |\ | |||
| | * | fixes | JAROWMR | 2 days |
| | | | |||
| | * | updated nan | JAROWMR | 3 days |
| | |\ | |||
| | | * | make format | JAROWMR | 3 days |
| | | | | |||
| | * | | removed collision test | JAROWMR | 3 days |
| | |/ | |||
| | * | merge master | JAROWMR | 3 days |
| | |\ | |||
| | | * | make format | heavydemon21 | 3 days |
| | | | | |||
| | | * | fixed ( placedment | heavydemon21 | 3 days |
| | | | | |||
| | | * | Merge branch 'master' into niels/UI | heavydemon21 | 3 days |
| | | |\ | |||
| | | | * | Merge branch 'master' into niels/rendering_fixes | Loek Le Blansch | 3 days |
| | | | |\ | |||
| | | | * | | make format | heavydemon21 | 4 days |
| | | | | | | |||
| | | | * | | added particle begin lifespan rendering, added world_space to sprite so that ↵ | heavydemon21 | 4 days |
| | | | | | | | | | | | | | | | | | | | | | | | | coordinates are in camera_space or world_sapce | ||
| | | * | | | rendering met absoluut position util functie, particle ben ik nog jaro aan ↵ | heavydemon21 | 4 days |
| | | | | | | | | | | | | | | | | | | | | | | | | het overleggen dus er die werkt niet goed | ||
| | | * | | | added transform scale and rotation in the drawing text component | heavydemon21 | 4 days |
| | | | | | | |||
| | | * | | | Merge branch 'master' into niels/UI | heavydemon21 | 5 days |
| | | |\| | | |||
| | | * | | | Merge branch 'master' into niels/UI | heavydemon21 | 5 days |
| | | |\ \ \ | |||
| | | * \ \ \ | Merge branch 'master' into niels/UI | heavydemon21 | 5 days |
| | | |\ \ \ \ | |||
| | | * | | | | | workig rending text | heavydemon21 | 5 days |
| | | | | | | | | |||
| | | * | | | | | Merge branch 'wouter/text-component' into niels/UI | heavydemon21 | 5 days |
| | | |\ \ \ \ \ | |||
| | | * \ \ \ \ \ | Merge branch 'wouter/text-component' into niels/UI | heavydemon21 | 5 days |
| | | |\ \ \ \ \ \ | |||
| | | * | | | | | | | tmp fix | heavydemon21 | 5 days |
| | | | | | | | | | | |||
| | | * | | | | | | | Merge branch 'wouter/text-component' into niels/UI | heavydemon21 | 5 days |
| | | |\ \ \ \ \ \ \ | |||
| | | * | | | | | | | | idk | heavydemon21 | 5 days |
| | | | | | | | | | | | |||
| | | * | | | | | | | | Merge branch 'wouter/text-component' into niels/UI | heavydemon21 | 6 days |
| | | |\ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | fonting | heavydemon21 | 6 days |
| | | | | | | | | | | | | |||
| | * | | | | | | | | | | removed test | JAROWMR | 3 days |
| | | | | | | | | | | | | |||
| | * | | | | | | | | | | updated coments and reverted test cmake | JAROWMR | 3 days |
| | | | | | | | | | | | | |||
| | * | | | | | | | | | | improved doxygen | JAROWMR | 3 days |
| | | | | | | | | | | | | |||
| | * | | | | | | | | | | tested system, added roation to emitter | JAROWMR | 3 days |
| | | | | | | | | | | | | |||
| | * | | | | | | | | | | fixed bug | JAROWMR | 3 days |
| | | | | | | | | | | | | |||
| | * | | | | | | | | | | bug fix and doxygen fix | JAROWMR | 3 days |
| | | | | | | | | | | | | |||
| | * | | | | | | | | | | testing dynamic | JAROWMR | 4 days |
| | | | | | | | | | | | | |||
| | * | | | | | | | | | | merged detection and resolution functions | JAROWMR | 4 days |
| | | | | | | | | | | | | |||
| | * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into ↵ | max-001 | 5 days |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | jaro/collision-system-handeling | ||
| | * | | | | | | | | | | pulled api change | JAROWMR | 6 days |
| | |\ \ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | | make format | JAROWMR | 6 days |
| | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | Merge branch 'jaro/particle-system-improvement' of github.com:lonkaars/crepe ↵ | JAROWMR | 6 days |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jaro/collision-system-handeling | ||
| | * | | | | | | | | | | | | Added util for position | JAROWMR | 6 days |
| | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | merge master | Loek Le Blansch | 4 days |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |||
| | * | | | | | | | | | | | | Merge branch 'master' into loek/scripts | Loek Le Blansch | 4 days |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | | | |||
| | * | | | | | | | | | | | | process feedback | Loek Le Blansch | 4 days |
| | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |||
| * | | | | | | | | | | | | merge master | Loek Le Blansch | 4 days |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | |||
| | * | | | | | | | | | | | make format | WBoerenkamps | 5 days |
| | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | feedback changes | WBoerenkamps | 5 days |
| | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into ↵ | WBoerenkamps | 5 days |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wouter/text-component | ||
| | * | | | | | | | | | | | small changes | WBoerenkamps | 5 days |
| | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | readded const and used emplace instead | WBoerenkamps | 5 days |
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |||
| | * | | | | | | | | | | final changes | WBoerenkamps | 5 days |
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | |||
| | * | | | | | | | | | testing something | WBoerenkamps | 5 days |
| | | | | | | | | | | |