Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Fixed collision layers | max-001 | 44 hours |
| | |||
* | Fix merge issues | max-001 | 44 hours |
| | |||
* | Merge remote-tracking branch 'origin/master' into max/game | max-001 | 44 hours |
|\ | |||
| * | add game folder | Loek Le Blansch | 44 hours |
| | | |||
| * | nitpick #91 | Loek Le Blansch | 44 hours |
| | | |||
| * | Merge branch 'wouter/relative_ui' of github.com:lonkaars/crepe | Loek Le Blansch | 45 hours |
| |\ | |||
| | * | make format | WBoerenkamps | 2 days |
| | | | |||
| | * | added const | WBoerenkamps | 2 days |
| | | | |||
| | * | merge with master | WBoerenkamps | 3 days |
| | |\ | |||
| | * | | made test better by seperating x and y values | WBoerenkamps | 3 days |
| | | | | |||
| | * | | removed empty if statement | WBoerenkamps | 3 days |
| | | | | |||
| | * | | make format | WBoerenkamps | 4 days |
| | | | | |||
| | * | | camera space working | WBoerenkamps | 4 days |
| | | | | |||
| * | | | merge loek/scripts | Loek Le Blansch | 45 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 | 45 hours |
| |\ \ \ \ \ | |||
| | * | | | | | fixes | JAROWMR | 46 hours |
| | | | | | | | |||
| | * | | | | | quick changes | WBoerenkamps | 46 hours |
| | | | | | | | |||
| | * | | | | | Merge pull request #85 from lonkaars/jaro/collision-system-handeling | Max-001 | 2 days |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Jaro/collision system handeling | ||
| | | * | | | | | make format | JAROWMR | 2 days |
| | | | | | | | | |||
| | | * | | | | | nan test fix | JAROWMR | 2 days |
| | | | | | | | | |||
| | | * | | | | | updated nan | JAROWMR | 2 days |
| | | |\ \ \ \ \ | |||
| | | | * | | | | | make format | JAROWMR | 3 days |
| | | | | | | | | | |||
| | | * | | | | | | is_nan fix | JAROWMR | 2 days |
| | | | | | | | | | |||
| | | * | | | | | | removed collision test | JAROWMR | 2 days |
| | | |/ / / / / | |||
| | | * | | | | | added doxygen | JAROWMR | 3 days |
| | | | | | | | | |||
| | | * | | | | | merge master | JAROWMR | 3 days |
| | | |\ \ \ \ \ | |||
| | | * | | | | | | removed test | JAROWMR | 3 days |
| | | | | | | | | | |||
| | | * | | | | | | updated coments and reverted test cmake | JAROWMR | 3 days |
| | | | | | | | | | |||
| | | * | | | | | | added some comments | JAROWMR | 3 days |
| | | | | | | | | | |||
| | | * | | | | | | improved doxygen comments | 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 |
| | | | | | | | | | |||
| | | * | | | | | | 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 | ||
| | | | * \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into ↵ | max-001 | 5 days |
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jaro/collision-system-handeling | ||
| | | * | | | | | | | | updating collision system | JAROWMR | 3 days |
| | | |/ / / / / / / | |||
| | | * | | | | | | | pulled api change | JAROWMR | 5 days |
| | | |\ \ \ \ \ \ \ | |||
| | | * | | | | | | | | make format | JAROWMR | 5 days |
| | | | | | | | | | | | |||
| | | * | | | | | | | | updated particle | JAROWMR | 5 days |
| | | | | | | | | | | | |||
| | | * | | | | | | | | Merge branch 'jaro/particle-system-improvement' of github.com:lonkaars/crepe ↵ | JAROWMR | 5 days |
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jaro/collision-system-handeling |