Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'wouter/relative_ui' of github.com:lonkaars/crepe | Loek Le Blansch | 47 hours |
|\ | |||
| * | make format | WBoerenkamps | 3 days |
| | | |||
| * | merge with master | WBoerenkamps | 3 days |
| |\ | |||
| * | | camera space working | WBoerenkamps | 4 days |
| | | | |||
* | | | merge loek/scripts | Loek Le Blansch | 47 hours |
|\ \ \ | |||
| * \ \ | Merge branch 'loek/replay' into loek/scriptsloek/scripts | Loek Le Blansch | 3 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 | 47 hours |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||
| * | | | | make format | JAROWMR | 3 days |
| | | | | | |||
| * | | | | updated nan | JAROWMR | 3 days |
| |\ \ \ \ | |||
| | * | | | | make format | JAROWMR | 3 days |
| | | | | | | |||
| * | | | | | is_nan fix | JAROWMR | 3 days |
| |/ / / / | |||
| * | | | | merge master | JAROWMR | 3 days |
| |\ \ \ \ | |||
| | * | | | | make format | 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 | ||
| | * | | | | implemented feedback | heavydemon21 | 5 days |
| | | | | | | |||
| | * | | | | merged master | heavydemon21 | 5 days |
| | | | | | | |||
| | * | | | | Merge branch 'master' into niels/UI | heavydemon21 | 5 days |
| | |\| | | | |||
| | * | | | | config will be checout with master once PR#77 is merged, and sdlcontext ↵ | heavydemon21 | 5 days |
| | | | | | | | | | | | | | | | | | | | | | | | | adjustemetns for merging | ||
| | * | | | | Merge branch 'master' into niels/UI | heavydemon21 | 5 days |
| | |\ \ \ \ | |||
| | * | | | | | revered to master | heavydemon21 | 5 days |
| | | | | | | | |||
| | * | | | | | Merge branch 'master' into niels/UI | 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 |
| | |\ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ | Merge branch 'wouter/text-component' into niels/UI | heavydemon21 | 5 days |
| | |\ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | idk | heavydemon21 | 5 days |
| | | | | | | | | | | | |||
| | * | | | | | | | | | fonting | heavydemon21 | 6 days |
| | | | | | | | | | | | |||
| * | | | | | | | | | | updated coments and reverted test cmake | JAROWMR | 3 days |
| | | | | | | | | | | | |||
| * | | | | | | | | | | improved doxygen | JAROWMR | 3 days |
| | | | | | | | | | | | |||
| * | | | | | | | | | | Merge branch 'jaro/collision-system-handeling' of github.com:lonkaars/crepe ↵ | JAROWMR | 4 days |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jaro/collision-system-handeling | ||
| | * \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into ↵ | max-001 | 5 days |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | jaro/collision-system-handeling | ||
| * | / | | | | | | | | | updating collision system | JAROWMR | 4 days |
| |/ / / / / / / / / / | |||
| * | | | | | | | | | | pulled api change | JAROWMR | 6 days |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jaro/particle-system-improvement' of github.com:lonkaars/crepe ↵ | JAROWMR | 6 days |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jaro/collision-system-handeling | ||
| * | | | | | | | | | | | | removed rigidbody offset | JAROWMR | 6 days |
| | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | added collision features | JAROWMR | 6 days |
| | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | merge master | Loek Le Blansch | 3 days |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |||
| * | | | | | | | | | | | Merge branch 'wouter/button-improvement' of github.com:lonkaars/crepe | Loek Le Blansch | 3 days |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | | feedback | WBoerenkamps | 5 days |
| | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | added max buttons | WBoerenkamps | 5 days |
| | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | removed api/ | WBoerenkamps | 5 days |
| | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | removed metadata header | WBoerenkamps | 5 days |
| | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | make format | WBoerenkamps | 5 days |
| | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | button improvements | WBoerenkamps | 5 days |
| | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into ↵ | WBoerenkamps | 5 days |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | wouter/button-improvement | ||
| | * | | | | | | | | | | | start | WBoerenkamps | 5 days |
| | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | Merge branch 'wouter/inputSystem' into wouter/button-improvement | WBoerenkamps | 5 days |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | | |