aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* merge masterLoek Le Blansch5 days
|\
| * make formatWBoerenkamps5 days
| |
| * button now using channelWBoerenkamps5 days
| |
* | Make formatmax-0015 days
| |
* | pull 3bda25f from demomax-0015 days
| |
* | Fixed collision layersmax-0015 days
| |
* | Fix merge issuesmax-0015 days
| |
* | Merge remote-tracking branch 'origin/master' into max/gamemax-0015 days
|\|
| * add game folderLoek Le Blansch5 days
| |
| * nitpick #91Loek Le Blansch5 days
| |
| * Merge branch 'wouter/relative_ui' of github.com:lonkaars/crepeLoek Le Blansch5 days
| |\
| | * make formatWBoerenkamps5 days
| | |
| | * added constWBoerenkamps5 days
| | |
| | * merge with masterWBoerenkamps6 days
| | |\
| | * | made test better by seperating x and y valuesWBoerenkamps6 days
| | | |
| | * | removed empty if statementWBoerenkamps6 days
| | | |
| | * | make formatWBoerenkamps7 days
| | | |
| | * | camera space workingWBoerenkamps7 days
| | | |
| * | | merge loek/scriptsLoek Le Blansch5 days
| |\ \ \
| | * \ \ Merge branch 'loek/replay' into loek/scriptsloek/scriptsLoek Le Blansch6 days
| | |\ \ \
| | * | | | feedbackLoek Le Blansch7 days
| | | | | |
| | * | | | update ScriptSystem doxygenLoek Le Blansch7 days
| | | | | |
| | * | | | `make format`Loek Le Blansch7 days
| | | | | |
| | * | | | add fixed/frame update functions to scriptLoek Le Blansch7 days
| | | | | |
| * | | | | merge masterloek/replayLoek Le Blansch5 days
| |\ \ \ \ \
| | * | | | | fixesJAROWMR5 days
| | | | | | |
| | * | | | | quick changesWBoerenkamps5 days
| | | | | | |
| | * | | | | Merge pull request #85 from lonkaars/jaro/collision-system-handelingMax-0015 days
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Jaro/collision system handeling
| | | * | | | | make formatJAROWMR5 days
| | | | | | | |
| | | * | | | | nan test fixJAROWMR5 days
| | | | | | | |
| | | * | | | | updated nanJAROWMR5 days
| | | |\ \ \ \ \
| | | | * | | | | make formatJAROWMR5 days
| | | | | | | | |
| | | * | | | | | is_nan fixJAROWMR5 days
| | | | | | | | |
| | | * | | | | | removed collision testJAROWMR5 days
| | | |/ / / / /
| | | * | | | | added doxygenJAROWMR5 days
| | | | | | | |
| | | * | | | | merge masterJAROWMR5 days
| | | |\ \ \ \ \
| | | * | | | | | removed testJAROWMR5 days
| | | | | | | | |
| | | * | | | | | updated coments and reverted test cmakeJAROWMR5 days
| | | | | | | | |
| | | * | | | | | added some commentsJAROWMR5 days
| | | | | | | | |
| | | * | | | | | improved doxygen commentsJAROWMR5 days
| | | | | | | | |
| | | * | | | | | improved doxygenJAROWMR6 days
| | | | | | | | |
| | | * | | | | | tested system, added roation to emitterJAROWMR6 days
| | | | | | | | |
| | | * | | | | | fixed bugJAROWMR6 days
| | | | | | | | |
| | | * | | | | | bug fix and doxygen fixJAROWMR6 days
| | | | | | | | |
| | | * | | | | | rotating sprite on particleJAROWMR6 days
| | | | | | | | |
| | | * | | | | | testing dynamicJAROWMR6 days
| | | | | | | | |
| | | * | | | | | merged detection and resolution functionsJAROWMR6 days
| | | | | | | | |
| | | * | | | | | before merging of resolution and handlingJAROWMR6 days
| | | | | | | | |
| | | * | | | | | Merge branch 'jaro/collision-system-handeling' of github.com:lonkaars/crepe ↵JAROWMR6 days
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jaro/collision-system-handeling
| | | | * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into ↵max-0018 days
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jaro/collision-system-handeling