aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* move game filesLoek Le Blansch26 hours
|
* merge masterLoek Le Blansch26 hours
|\
| * make formatWBoerenkamps27 hours
| |
| * button now using channelWBoerenkamps27 hours
| |
* | Make formatmax-00126 hours
| |
* | pull 3bda25f from demomax-00127 hours
| |
* | Fixed collision layersmax-00127 hours
| |
* | Fix merge issuesmax-00127 hours
| |
* | Merge remote-tracking branch 'origin/master' into max/gamemax-00127 hours
|\|
| * add game folderLoek Le Blansch27 hours
| |
| * nitpick #91Loek Le Blansch28 hours
| |
| * Merge branch 'wouter/relative_ui' of github.com:lonkaars/crepeLoek Le Blansch28 hours
| |\
| | * make formatWBoerenkamps41 hours
| | |
| | * added constWBoerenkamps41 hours
| | |
| | * merge with masterWBoerenkamps2 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 Blansch28 hours
| |\ \ \
| | * \ \ Merge branch 'loek/replay' into loek/scriptsloek/scriptsLoek Le Blansch2 days
| | |\ \ \
| | * | | | feedbackLoek Le Blansch3 days
| | | | | |
| | * | | | update ScriptSystem doxygenLoek Le Blansch3 days
| | | | | |
| | * | | | `make format`Loek Le Blansch3 days
| | | | | |
| | * | | | add fixed/frame update functions to scriptLoek Le Blansch3 days
| | | | | |
| * | | | | merge masterloek/replayLoek Le Blansch28 hours
| |\ \ \ \ \
| | * | | | | fixesJAROWMR29 hours
| | | | | | |
| | * | | | | quick changesWBoerenkamps29 hours
| | | | | | |
| | * | | | | Merge pull request #85 from lonkaars/jaro/collision-system-handelingMax-00141 hours
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Jaro/collision system handeling
| | | * | | | | make formatJAROWMR42 hours
| | | | | | | |
| | | * | | | | nan test fixJAROWMR43 hours
| | | | | | | |
| | | * | | | | updated nanJAROWMR43 hours
| | | |\ \ \ \ \
| | | | * | | | | make formatJAROWMR43 hours
| | | | | | | | |
| | | * | | | | | is_nan fixJAROWMR43 hours
| | | | | | | | |
| | | * | | | | | removed collision testJAROWMR43 hours
| | | |/ / / / /
| | | * | | | | added doxygenJAROWMR44 hours
| | | | | | | |
| | | * | | | | merge masterJAROWMR44 hours
| | | |\ \ \ \ \
| | | * | | | | | removed testJAROWMR44 hours
| | | | | | | | |
| | | * | | | | | updated coments and reverted test cmakeJAROWMR44 hours
| | | | | | | | |
| | | * | | | | | added some commentsJAROWMR44 hours
| | | | | | | | |
| | | * | | | | | improved doxygen commentsJAROWMR44 hours
| | | | | | | | |
| | | * | | | | | improved doxygenJAROWMR45 hours
| | | | | | | | |
| | | * | | | | | tested system, added roation to emitterJAROWMR2 days
| | | | | | | | |
| | | * | | | | | fixed bugJAROWMR2 days
| | | | | | | | |
| | | * | | | | | bug fix and doxygen fixJAROWMR2 days
| | | | | | | | |
| | | * | | | | | rotating sprite on particleJAROWMR2 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