aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAge
* Merge branch 'master' of github.com:lonkaars/crepe into jaro/collision-systemJAROWMR11 days
|\
| * fix SceneManagerTestLoek Le Blansch11 days
| * Merge branch 'jaro/collision-system' of github.com:lonkaars/crepeLoek Le Blansch11 days
| |\
| * \ Merge branch 'master' of github.com:lonkaars/crepe into jaro/mediator_conceal...JAROWMR11 days
| |\ \
| | * \ Merge pull request #76 from lonkaars/wouter/gameloopWboerenkamps11 days
| | |\ \
| | | * | made test less strictWBoerenkamps12 days
| | | * | include fixWBoerenkamps12 days
| | | * | made return unsigned intWBoerenkamps12 days
| | | * | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/gameloopWBoerenkamps12 days
| | | |\ \
| | | * | | fps fix + regression testWBoerenkamps12 days
| | * | | | bugfix animatorsystemheavydemon2112 days
| | | |/ / | | |/| |
| * | | | make formatJAROWMR11 days
| * | | | moved code to cppJAROWMR11 days
| * | | | added scene to cmakeJAROWMR11 days
| * | | | added feedbackJAROWMR11 days
| * | | | moved mediator upJAROWMR11 days
| * | | | removed merge includeJAROWMR12 days
| * | | | Merge branch 'jaro/mediator_concealing_scene' of github.com:lonkaars/crepe in...JAROWMR12 days
| |\ \ \ \
| | * | | | formatJAROWMR12 days
| * | | | | fixed includesJAROWMR12 days
| |/ / / /
| * / / / shielded mediatorJAROWMR12 days
| |/ / /
| * | | revertedJAROWMR12 days
| * | | change get fixed_dt to floatJAROWMR12 days
| * | | made better readableJAROWMR12 days
| * | | updated test valuesJAROWMR12 days
| * | | updated constraintsJAROWMR13 days
| * | | change get dtJAROWMR13 days
| * | | Merge branch 'master' of github.com:lonkaars/crepe into jaro/physics-system-i...JAROWMR13 days
| |\ \ \
| | * | | `make format`Loek Le Blansch13 days
| | * | | fix testsLoek Le Blansch13 days
| | * | | hotfix inputtest.cppheavydemon2113 days
| * | | | make formatJAROWMR13 days
| * | | | reverted fileJAROWMR13 days
| * | | | added rotation for previewJAROWMR13 days
| * | | | removed merge fileJAROWMR13 days
| * | | | fixed gameJAROWMR13 days
| * | | | updated testJAROWMR13 days
| * | | | timing fixJAROWMR13 days
| * | | | added fixed updateJAROWMR13 days
| * | | | merge masterJAROWMR13 days
| |\| | |
| | * | | removed \class rendersystemheavydemon2113 days
| | * | | removed \class in sdlcontextheavydemon2113 days
| | * | | Merge branch 'master' into niels/UIheavydemon2113 days
| | |\| |
| | | * | last changesWBoerenkamps13 days
| | | * | mege with masterWBoerenkamps13 days
| | | |\ \
| | | * | | testing less strictWBoerenkamps13 days
| | | * | | fps to unsignedWBoerenkamps13 days
| | | * | | make formatWBoerenkamps14 days
| | | * | | feedback changed and merge workingWBoerenkamps14 days
| | | * | | Merge branch 'wouter/gameloop' of https://github.com/lonkaars/crepe into wout...WBoerenkamps14 days
| | | |\ \ \