aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAge
* merge masterLoek Le Blansch5 days
|\
| * Merge branch 'wouter/button-improvement' of github.com:lonkaars/crepeLoek Le Blansch5 days
| |\
| | * make formatWBoerenkamps6 days
| | * feedbackWBoerenkamps6 days
| | * added max buttonsWBoerenkamps6 days
| | * added missing doxygenWBoerenkamps6 days
| | * removed ;WBoerenkamps6 days
| | * removed api/WBoerenkamps6 days
| | * removed metadata headerWBoerenkamps6 days
| | * make formatWBoerenkamps6 days
| | * button improvementsWBoerenkamps6 days
| | * Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/button...WBoerenkamps6 days
| | |\
| | * | startWBoerenkamps7 days
| | * | Merge branch 'wouter/inputSystem' into wouter/button-improvementWBoerenkamps7 days
| | |\ \
| * | \ \ Merge branch 'loek/audio'Loek Le Blansch5 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 masterLoek Le Blansch6 days
|\| | | | |
| * | | | | Merge branch 'master' into loek/scriptsLoek Le Blansch6 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 Blansch10 days
| |\ \ \ \ \ \ \ \
| * | | | | | | | | `make format`Loek Le Blansch10 days
| * | | | | | | | | update testsLoek Le Blansch10 days
| * | | | | | | | | add timer functionality to scriptLoek Le Blansch10 days
* | | | | | | | | | Merge branch 'master' into loek/replayLoek Le Blansch6 days
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'master' into loek/savemgrloek/savemgrLoek Le Blansch6 days
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'master' into loek/savemgrLoek Le Blansch6 days
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | `make format`Loek Le Blansch9 days
| * | | | | | | | | | move DB fix from `loek/doxygen` to `loek/savemgr`Loek Le Blansch9 days
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | merge masterLoek Le Blansch6 days
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | `make format`Loek Le Blansch6 days
| * | | | | | | | | fix tests + nitpick #77Loek Le Blansch6 days
| * | | | | | | | | make formatWBoerenkamps6 days
| * | | | | | | | | feedback changesWBoerenkamps6 days
| * | | | | | | | | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/text-c...WBoerenkamps6 days
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | small changesWBoerenkamps6 days
| * | | | | | | | | readded const and used emplace insteadWBoerenkamps6 days
| * | | | | | | | | final changesWBoerenkamps7 days
| * | | | | | | | | last changesWBoerenkamps7 days
| * | | | | | | | | removed iostreamWBoerenkamps7 days
| * | | | | | | | | testing somethingWBoerenkamps7 days
| * | | | | | | | | text now working with optionalWBoerenkamps7 days
| * | | | | | | | | code not workingWBoerenkamps7 days
| * | | | | | | | | make formatWBoerenkamps7 days