aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'origin/master' into max/gamemax-0019 days
|\
| * Merge pull request #83 from lonkaars/jaro/collision-api-changeheavydemon219 days
| |\
| | * make formatJAROWMR11 days
| | * updated testJAROWMR11 days
| | * used add force in game.cppJAROWMR12 days
| | * updated api and gameJAROWMR12 days
| |/
* | Deleted some unecessary includesmax-0019 days
* | Placed every class into seperate filemax-0019 days
* | Modified includesmax-0019 days
* | Split everything into seperate classesmax-0019 days
* | Set correct velocity (after bug fix)max-0019 days
* | Renamed mgr to scnmax-0019 days
* | Passing Scene instance instead of ComponentManagermax-0019 days
* | Merge remote-tracking branch 'origin/master' into max/gamemax-0019 days
|\|
| * `make format`Loek Le Blansch12 days
| * Merge branch 'master' of github.com:lonkaars/crepe into jaro/collision-systemJAROWMR12 days
| |\
| | * fix SceneManagerTestLoek Le Blansch12 days
| | * Merge branch 'jaro/collision-system' of github.com:lonkaars/crepeLoek Le Blansch12 days
| | |\
| | * \ Merge branch 'master' of github.com:lonkaars/crepe into jaro/mediator_conceal...JAROWMR12 days
| | |\ \
| | | * \ Merge pull request #76 from lonkaars/wouter/gameloopWboerenkamps12 days
| | | |\ \
| | | | * | made test less strictWBoerenkamps12 days
| | | | * | include fixWBoerenkamps13 days
| | | | * | made return unsigned intWBoerenkamps13 days
| | | | * | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/gameloopWBoerenkamps13 days
| | | | |\ \
| | | | * | | fps fix + regression testWBoerenkamps13 days
| | | * | | | bugfix animatorsystemheavydemon2113 days
| | | | |/ / | | | |/| |
| | * | | | make formatJAROWMR12 days
| | * | | | moved code to cppJAROWMR12 days
| | * | | | added scene to cmakeJAROWMR12 days
| | * | | | added feedbackJAROWMR12 days
| | * | | | moved mediator upJAROWMR12 days
| | * | | | removed merge includeJAROWMR13 days
| | * | | | Merge branch 'jaro/mediator_concealing_scene' of github.com:lonkaars/crepe in...JAROWMR13 days
| | |\ \ \ \
| | | * | | | formatJAROWMR13 days
| | * | | | | fixed includesJAROWMR13 days
| | |/ / / /
| | * / / / shielded mediatorJAROWMR13 days
| | |/ / /
| | * | | Merge pull request #64 from lonkaars/jaro/physics-system-improvementJaro13 days
| | |\ \ \
| | | * | | revertedJAROWMR13 days
| | | * | | change get fixed_dt to floatJAROWMR13 days
| | | * | | made better readableJAROWMR13 days
| | | * | | updated test valuesJAROWMR13 days
| | | * | | updated constraintsJAROWMR13 days
| | | * | | change get dtJAROWMR13 days
| | | * | | Merge branch 'master' of github.com:lonkaars/crepe into jaro/physics-system-i...JAROWMR13 days
| | | |\ \ \ | | | |/ / / | | |/| | |
| | | * | | make formatJAROWMR13 days
| | | * | | reverted fileJAROWMR13 days
| | | * | | added rotation for previewJAROWMR13 days
| | | * | | removed merge fileJAROWMR13 days
| | | * | | fixed gameJAROWMR13 days
| | | * | | updated testJAROWMR13 days