Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | merge loek/scripts | Loek Le Blansch | 43 hours |
|\ | |||
| * | Merge branch 'loek/replay' into loek/scriptsloek/scripts | Loek Le Blansch | 3 days |
| |\ | |||
| * | | feedback | Loek Le Blansch | 4 days |
| | | | |||
| * | | update ScriptSystem doxygen | Loek Le Blansch | 4 days |
| | | | |||
| * | | `make format` | Loek Le Blansch | 4 days |
| | | | |||
| * | | add fixed/frame update functions to script | Loek Le Blansch | 4 days |
| | | | |||
* | | | merge masterloek/replay | Loek Le Blansch | 43 hours |
|\ \ \ | |_|/ |/| | | |||
| * | | fixes | JAROWMR | 44 hours |
| | | | |||
| * | | make format | JAROWMR | 2 days |
| | | | |||
| * | | nan test fix | JAROWMR | 2 days |
| | | | |||
| * | | updated nan | JAROWMR | 2 days |
| |\ \ | |||
| | * | | make format | JAROWMR | 2 days |
| | | | | |||
| * | | | is_nan fix | JAROWMR | 2 days |
| |/ / | |||
| * | | merge master | JAROWMR | 2 days |
| |\ \ | |||
| | * | | make format | heavydemon21 | 3 days |
| | | | | |||
| | * | | adjusted tm naming --> transform and adjusted doxygen comments | heavydemon21 | 3 days |
| | | | | |||
| | * | | make format | heavydemon21 | 3 days |
| | | | | |||
| | * | | fix merge conflict | heavydemon21 | 3 days |
| | | | | |||
| | * | | Merge branch 'master' into niels/UI | heavydemon21 | 3 days |
| | |\ \ | |||
| | | * \ | Merge branch 'master' into niels/rendering_fixes | Loek Le Blansch | 3 days |
| | | |\ \ | |||
| | | * | | | added particle begin lifespan rendering, added world_space to sprite so that ↵ | heavydemon21 | 4 days |
| | | | | | | | | | | | | | | | | | | | | | | | | coordinates are in camera_space or world_sapce | ||
| | * | | | | removed absolute position because jaro is adjusting that | heavydemon21 | 3 days |
| | | | | | | |||
| | * | | | | rendering met absoluut position util functie, particle ben ik nog jaro aan ↵ | heavydemon21 | 3 days |
| | | | | | | | | | | | | | | | | | | | | | | | | het overleggen dus er die werkt niet goed | ||
| | * | | | | implemented feedback | heavydemon21 | 4 days |
| | | | | | | |||
| | * | | | | merged master | heavydemon21 | 5 days |
| | | | | | | |||
| | * | | | | Merge branch 'master' into niels/UI | heavydemon21 | 5 days |
| | |\ \ \ \ | |||
| | * | | | | | adjusted comments | heavydemon21 | 5 days |
| | | | | | | | |||
| | * | | | | | Merge branch 'master' into niels/UI | heavydemon21 | 5 days |
| | |\ \ \ \ \ | |||
| | * | | | | | | finalized text rendering | heavydemon21 | 5 days |
| | | | | | | | | |||
| | * | | | | | | make format | heavydemon21 | 5 days |
| | | | | | | | | |||
| | * | | | | | | workig rending text | heavydemon21 | 5 days |
| | | | | | | | | |||
| | * | | | | | | Merge branch 'wouter/text-component' into niels/UI | heavydemon21 | 5 days |
| | |\ \ \ \ \ \ | |||
| | * | | | | | | | merging wouter | heavydemon21 | 5 days |
| | | | | | | | | | |||
| | * | | | | | | | Merge branch 'wouter/text-component' into niels/UI | heavydemon21 | 5 days |
| | |\ \ \ \ \ \ \ | |||
| | * | | | | | | | | tmp fix | heavydemon21 | 5 days |
| | | | | | | | | | | |||
| | * | | | | | | | | idk | heavydemon21 | 5 days |
| | | | | | | | | | | |||
| | * | | | | | | | | rendersys | heavydemon21 | 5 days |
| | | | | | | | | | | |||
| | * | | | | | | | | fonting | heavydemon21 | 5 days |
| | | | | | | | | | | |||
| * | | | | | | | | | updated coments and reverted test cmake | JAROWMR | 2 days |
| | | | | | | | | | | |||
| * | | | | | | | | | added some comments | JAROWMR | 2 days |
| | | | | | | | | | | |||
| * | | | | | | | | | improved doxygen comments | JAROWMR | 2 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 |
| | | | | | | | | | | |||
| * | | | | | | | | | rotating sprite on particle | JAROWMR | 3 days |
| | | | | | | | | | | |||
| * | | | | | | | | | testing dynamic | JAROWMR | 3 days |
| | | | | | | | | | | |||
| * | | | | | | | | | merged detection and resolution functions | JAROWMR | 3 days |
| | | | | | | | | | | |||
| * | | | | | | | | | before merging of resolution and handling | JAROWMR | 3 days |
| | | | | | | | | | | |||
| * | | | | | | | | | Merge branch 'jaro/collision-system-handeling' of github.com:lonkaars/crepe ↵ | JAROWMR | 3 days |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jaro/collision-system-handeling |