aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Fixed collision layersmax-0013 days
* Fix merge issuesmax-0013 days
* Merge remote-tracking branch 'origin/master' into max/gamemax-0013 days
|\
| * add game folderLoek Le Blansch3 days
| * nitpick #91Loek Le Blansch3 days
| * Merge branch 'wouter/relative_ui' of github.com:lonkaars/crepeLoek Le Blansch3 days
| |\
| | * make formatWBoerenkamps3 days
| | * added constWBoerenkamps3 days
| | * merge with masterWBoerenkamps4 days
| | |\
| | * | made test better by seperating x and y valuesWBoerenkamps4 days
| | * | removed empty if statementWBoerenkamps4 days
| | * | make formatWBoerenkamps4 days
| | * | camera space workingWBoerenkamps4 days
| * | | merge loek/scriptsLoek Le Blansch3 days
| |\ \ \
| | * \ \ Merge branch 'loek/replay' into loek/scriptsloek/scriptsLoek Le Blansch4 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 Blansch3 days
| |\ \ \ \ \
| | * | | | | fixesJAROWMR3 days
| | * | | | | quick changesWBoerenkamps3 days
| | * | | | | Merge pull request #85 from lonkaars/jaro/collision-system-handelingMax-0013 days
| | |\ \ \ \ \
| | | * | | | | make formatJAROWMR3 days
| | | * | | | | nan test fixJAROWMR3 days
| | | * | | | | updated nanJAROWMR3 days
| | | |\ \ \ \ \
| | | | * | | | | make formatJAROWMR3 days
| | | * | | | | | is_nan fixJAROWMR3 days
| | | * | | | | | removed collision testJAROWMR3 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 bugJAROWMR4 days
| | | * | | | | | bug fix and doxygen fixJAROWMR4 days
| | | * | | | | | rotating sprite on particleJAROWMR4 days
| | | * | | | | | testing dynamicJAROWMR4 days
| | | * | | | | | merged detection and resolution functionsJAROWMR4 days
| | | * | | | | | before merging of resolution and handlingJAROWMR4 days
| | | * | | | | | Merge branch 'jaro/collision-system-handeling' of github.com:lonkaars/crepe i...JAROWMR4 days
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into jaro/collision-system-hande...max-0015 days
| | | | |\ \ \ \ \ \
| | | * | | | | | | | updating collision systemJAROWMR4 days
| | | |/ / / / / / /
| | | * | | | | | | pulled api changeJAROWMR6 days
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | make formatJAROWMR6 days
| | | * | | | | | | | updated particleJAROWMR6 days
| | | * | | | | | | | Merge branch 'jaro/particle-system-improvement' of github.com:lonkaars/crepe ...JAROWMR6 days
| | | |\ \ \ \ \ \ \ \