aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* finish moving gameLoek Le Blansch37 hours
* move game filesLoek Le Blansch38 hours
* merge masterLoek Le Blansch38 hours
|\
| * make formatWBoerenkamps38 hours
| * button now using channelWBoerenkamps38 hours
* | Make formatmax-00138 hours
* | pull 3bda25f from demomax-00138 hours
* | Fixed collision layersmax-00138 hours
* | Fix merge issuesmax-00138 hours
* | Merge remote-tracking branch 'origin/master' into max/gamemax-00138 hours
|\|
| * add game folderLoek Le Blansch39 hours
| * nitpick #91Loek Le Blansch39 hours
| * Merge branch 'wouter/relative_ui' of github.com:lonkaars/crepeLoek Le Blansch39 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 formatWBoerenkamps3 days
| | * | camera space workingWBoerenkamps3 days
| * | | merge loek/scriptsLoek Le Blansch39 hours
| |\ \ \
| | * \ \ Merge branch 'loek/replay' into loek/scriptsloek/scriptsLoek Le Blansch3 days
| | |\ \ \
| | * | | | feedbackLoek Le Blansch3 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 Blansch39 hours
| |\ \ \ \ \
| | * | | | | fixesJAROWMR41 hours
| | * | | | | quick changesWBoerenkamps41 hours
| | * | | | | Merge pull request #85 from lonkaars/jaro/collision-system-handelingMax-0012 days
| | |\ \ \ \ \
| | | * | | | | make formatJAROWMR2 days
| | | * | | | | nan test fixJAROWMR2 days
| | | * | | | | updated nanJAROWMR2 days
| | | |\ \ \ \ \
| | | | * | | | | make formatJAROWMR2 days
| | | * | | | | | is_nan fixJAROWMR2 days
| | | * | | | | | removed collision testJAROWMR2 days
| | | |/ / / / /
| | | * | | | | added doxygenJAROWMR2 days
| | | * | | | | merge masterJAROWMR2 days
| | | |\ \ \ \ \
| | | * | | | | | removed testJAROWMR2 days
| | | * | | | | | updated coments and reverted test cmakeJAROWMR2 days
| | | * | | | | | added some commentsJAROWMR2 days
| | | * | | | | | improved doxygen commentsJAROWMR2 days
| | | * | | | | | improved doxygenJAROWMR2 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