aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* added doxygenJAROWMR5 days
* merge masterJAROWMR5 days
|\
| * Merge pull request #86 from lonkaars/niels/UIheavydemon215 days
| |\
| | * removed adding extra offsetheavydemon215 days
| | * removed coutheavydemon215 days
| | * make formatheavydemon215 days
| | * fixed ( placedmentheavydemon215 days
| | * removed absoluut position because file name, renamed functions in sdlcontextheavydemon215 days
| | * checkout jaro collision handlening branchheavydemon215 days
| | * adjusted tm naming --> transform and adjusted doxygen commentsheavydemon215 days
| | * make formatheavydemon215 days
| | * fix merge conflictheavydemon215 days
| | * Merge branch 'master' into niels/UIheavydemon215 days
| | |\ | | |/ | |/|
| * | Merge branch 'master' into niels/rendering_fixesLoek Le Blansch5 days
| |\ \
| | * | update .gitignoreLoek Le Blansch5 days
| | * | Merge branch 'wouter/button-improvement' of github.com:lonkaars/crepeLoek Le Blansch5 days
| | |\ \
| | | * | make formatWBoerenkamps7 days
| | | * | feedbackWBoerenkamps7 days
| | | * | added max buttonsWBoerenkamps7 days
| | | * | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/button...WBoerenkamps7 days
| | | |\ \
| | | * | | added missing doxygenWBoerenkamps7 days
| | | * | | removed ;WBoerenkamps7 days
| | | * | | removed api/WBoerenkamps7 days
| | | * | | removed metadata headerWBoerenkamps7 days
| | | * | | make formatWBoerenkamps7 days
| | | * | | button improvementsWBoerenkamps7 days
| | | * | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/button...WBoerenkamps7 days
| | | |\ \ \
| | | * | | | startWBoerenkamps7 days
| | | * | | | Merge branch 'wouter/inputSystem' into wouter/button-improvementWBoerenkamps7 days
| | | |\ \ \ \
| | * | \ \ \ \ Merge branch 'loek/audio'Loek Le Blansch6 days
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'master' into loek/audioloek/audioLoek Le Blansch6 days
| | | |\ \ \ \ \ \
| | | * | | | | | | restore examplesLoek Le Blansch6 days
| | | * | | | | | | add test + fix audio crashLoek Le Blansch6 days
| | | | |_|_|_|/ / | | | |/| | | | |
| | * | | | | | | Merge branch 'master' into loek/scriptsLoek Le Blansch6 days
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Merge branch 'master' into loek/savemgrloek/savemgrLoek Le Blansch6 days
| | | |\| | | | |
| | | * | | | | | Merge branch 'master' into loek/savemgrLoek Le Blansch7 days
| | | |\ \ \ \ \ \
| | | * | | | | | | `make format`Loek Le Blansch10 days
| | | * | | | | | | move DB fix from `loek/doxygen` to `loek/savemgr`Loek Le Blansch10 days
| | * | | | | | | | fix ScriptSystem delta timeLoek Le Blansch6 days
| | * | | | | | | | Merge branch 'master' into loek/scriptsLoek Le Blansch6 days
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | * | | | | | | | process feedbackLoek Le Blansch6 days
| | * | | | | | | | merge masterLoek Le Blansch7 days
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into loek/scriptsLoek Le Blansch10 days
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | |
| | * | | | | | | | | Merge branch 'master' into loek/scriptsLoek Le Blansch10 days
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:lonkaars/crepe into loek/scriptsLoek Le Blansch11 days
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | `make format`Loek Le Blansch11 days
| | * | | | | | | | | | | update testsLoek Le Blansch11 days
| | * | | | | | | | | | | add timer functionality to scriptLoek Le Blansch11 days
| * | | | | | | | | | | | implemented wouter feedbackheavydemon216 days
| * | | | | | | | | | | | make formatheavydemon216 days