aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* move game filesLoek Le Blansch4 days
* merge masterLoek Le Blansch4 days
|\
| * make formatWBoerenkamps4 days
| * button now using channelWBoerenkamps4 days
* | Make formatmax-0014 days
* | pull 3bda25f from demomax-0014 days
* | Fixed collision layersmax-0014 days
* | Fix merge issuesmax-0014 days
* | Merge remote-tracking branch 'origin/master' into max/gamemax-0014 days
|\|
| * add game folderLoek Le Blansch4 days
| * nitpick #91Loek Le Blansch4 days
| * Merge branch 'wouter/relative_ui' of github.com:lonkaars/crepeLoek Le Blansch4 days
| |\
| | * make formatWBoerenkamps4 days
| | * added constWBoerenkamps4 days
| | * merge with masterWBoerenkamps5 days
| | |\
| | * | made test better by seperating x and y valuesWBoerenkamps5 days
| | * | removed empty if statementWBoerenkamps5 days
| | * | make formatWBoerenkamps6 days
| | * | camera space workingWBoerenkamps6 days
| * | | merge loek/scriptsLoek Le Blansch4 days
| |\ \ \
| | * \ \ Merge branch 'loek/replay' into loek/scriptsloek/scriptsLoek Le Blansch5 days
| | |\ \ \
| | * | | | feedbackLoek Le Blansch5 days
| | * | | | update ScriptSystem doxygenLoek Le Blansch6 days
| | * | | | `make format`Loek Le Blansch6 days
| | * | | | add fixed/frame update functions to scriptLoek Le Blansch6 days
| * | | | | merge masterloek/replayLoek Le Blansch4 days
| |\ \ \ \ \
| | * | | | | fixesJAROWMR4 days
| | * | | | | quick changesWBoerenkamps4 days
| | * | | | | Merge pull request #85 from lonkaars/jaro/collision-system-handelingMax-0014 days
| | |\ \ \ \ \
| | | * | | | | make formatJAROWMR4 days
| | | * | | | | nan test fixJAROWMR4 days
| | | * | | | | updated nanJAROWMR4 days
| | | |\ \ \ \ \
| | | | * | | | | make formatJAROWMR4 days
| | | * | | | | | is_nan fixJAROWMR4 days
| | | * | | | | | removed collision testJAROWMR4 days
| | | |/ / / / /
| | | * | | | | added doxygenJAROWMR4 days
| | | * | | | | merge masterJAROWMR4 days
| | | |\ \ \ \ \
| | | * | | | | | removed testJAROWMR4 days
| | | * | | | | | updated coments and reverted test cmakeJAROWMR4 days
| | | * | | | | | added some commentsJAROWMR4 days
| | | * | | | | | improved doxygen commentsJAROWMR4 days
| | | * | | | | | improved doxygenJAROWMR4 days
| | | * | | | | | tested system, added roation to emitterJAROWMR5 days
| | | * | | | | | fixed bugJAROWMR5 days
| | | * | | | | | bug fix and doxygen fixJAROWMR5 days
| | | * | | | | | rotating sprite on particleJAROWMR5 days
| | | * | | | | | testing dynamicJAROWMR5 days
| | | * | | | | | merged detection and resolution functionsJAROWMR5 days
| | | * | | | | | before merging of resolution and handlingJAROWMR5 days
| | | * | | | | | Merge branch 'jaro/collision-system-handeling' of github.com:lonkaars/crepe i...JAROWMR5 days
| | | |\ \ \ \ \ \