aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Fixed collision layersmax-00144 hours
|
* Fix merge issuesmax-00144 hours
|
* Merge remote-tracking branch 'origin/master' into max/gamemax-00144 hours
|\
| * add game folderLoek Le Blansch44 hours
| |
| * nitpick #91Loek Le Blansch44 hours
| |
| * Merge branch 'wouter/relative_ui' of github.com:lonkaars/crepeLoek Le Blansch45 hours
| |\
| | * make formatWBoerenkamps2 days
| | |
| | * added constWBoerenkamps2 days
| | |
| | * merge with masterWBoerenkamps3 days
| | |\
| | * | made test better by seperating x and y valuesWBoerenkamps3 days
| | | |
| | * | removed empty if statementWBoerenkamps3 days
| | | |
| | * | make formatWBoerenkamps4 days
| | | |
| | * | camera space workingWBoerenkamps4 days
| | | |
| * | | merge loek/scriptsLoek Le Blansch45 hours
| |\ \ \
| | * \ \ Merge branch 'loek/replay' into loek/scriptsloek/scriptsLoek Le Blansch3 days
| | |\ \ \
| | * | | | feedbackLoek Le Blansch4 days
| | | | | |
| | * | | | update ScriptSystem doxygenLoek Le Blansch4 days
| | | | | |
| | * | | | `make format`Loek Le Blansch4 days
| | | | | |
| | * | | | add fixed/frame update functions to scriptLoek Le Blansch4 days
| | | | | |
| * | | | | merge masterloek/replayLoek Le Blansch45 hours
| |\ \ \ \ \
| | * | | | | fixesJAROWMR46 hours
| | | | | | |
| | * | | | | quick changesWBoerenkamps46 hours
| | | | | | |
| | * | | | | Merge pull request #85 from lonkaars/jaro/collision-system-handelingMax-0012 days
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Jaro/collision system handeling
| | | * | | | | make formatJAROWMR2 days
| | | | | | | |
| | | * | | | | nan test fixJAROWMR2 days
| | | | | | | |
| | | * | | | | updated nanJAROWMR2 days
| | | |\ \ \ \ \
| | | | * | | | | make formatJAROWMR3 days
| | | | | | | | |
| | | * | | | | | is_nan fixJAROWMR2 days
| | | | | | | | |
| | | * | | | | | removed collision testJAROWMR2 days
| | | |/ / / / /
| | | * | | | | added doxygenJAROWMR3 days
| | | | | | | |
| | | * | | | | merge masterJAROWMR3 days
| | | |\ \ \ \ \
| | | * | | | | | removed testJAROWMR3 days
| | | | | | | | |
| | | * | | | | | updated coments and reverted test cmakeJAROWMR3 days
| | | | | | | | |
| | | * | | | | | added some commentsJAROWMR3 days
| | | | | | | | |
| | | * | | | | | improved doxygen commentsJAROWMR3 days
| | | | | | | | |
| | | * | | | | | improved doxygenJAROWMR3 days
| | | | | | | | |
| | | * | | | | | tested system, added roation to emitterJAROWMR3 days
| | | | | | | | |
| | | * | | | | | fixed bugJAROWMR3 days
| | | | | | | | |
| | | * | | | | | bug fix and doxygen fixJAROWMR3 days
| | | | | | | | |
| | | * | | | | | rotating sprite on particleJAROWMR3 days
| | | | | | | | |
| | | * | | | | | testing dynamicJAROWMR3 days
| | | | | | | | |
| | | * | | | | | merged detection and resolution functionsJAROWMR3 days
| | | | | | | | |
| | | * | | | | | before merging of resolution and handlingJAROWMR3 days
| | | | | | | | |
| | | * | | | | | Merge branch 'jaro/collision-system-handeling' of github.com:lonkaars/crepe ↵JAROWMR3 days
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jaro/collision-system-handeling
| | | | * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into ↵max-0015 days
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jaro/collision-system-handeling
| | | * | | | | | | | updating collision systemJAROWMR3 days
| | | |/ / / / / / /
| | | * | | | | | | pulled api changeJAROWMR5 days
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | make formatJAROWMR5 days
| | | | | | | | | | |
| | | * | | | | | | | updated particleJAROWMR5 days
| | | | | | | | | | |
| | | * | | | | | | | Merge branch 'jaro/particle-system-improvement' of github.com:lonkaars/crepe ↵JAROWMR5 days
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jaro/collision-system-handeling