aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'origin/master' into max/gamemax-0016 days
|\
| * Merge pull request #83 from lonkaars/jaro/collision-api-changeheavydemon216 days
| |\
| | * make formatJAROWMR8 days
| | * updated testJAROWMR8 days
| | * used add force in game.cppJAROWMR8 days
| | * updated api and gameJAROWMR8 days
| |/
* | Deleted some unecessary includesmax-0016 days
* | Placed every class into seperate filemax-0016 days
* | Modified includesmax-0016 days
* | Split everything into seperate classesmax-0016 days
* | Set correct velocity (after bug fix)max-0016 days
* | Renamed mgr to scnmax-0016 days
* | Passing Scene instance instead of ComponentManagermax-0016 days
* | Merge remote-tracking branch 'origin/master' into max/gamemax-0016 days
|\|
| * `make format`Loek Le Blansch8 days
| * Merge branch 'master' of github.com:lonkaars/crepe into jaro/collision-systemJAROWMR8 days
| |\
| | * fix SceneManagerTestLoek Le Blansch8 days
| | * Merge branch 'jaro/collision-system' of github.com:lonkaars/crepeLoek Le Blansch8 days
| | |\
| | * \ Merge branch 'master' of github.com:lonkaars/crepe into jaro/mediator_conceal...JAROWMR9 days
| | |\ \
| | | * \ Merge pull request #76 from lonkaars/wouter/gameloopWboerenkamps9 days
| | | |\ \
| | | | * | made test less strictWBoerenkamps9 days
| | | | * | include fixWBoerenkamps10 days
| | | | * | made return unsigned intWBoerenkamps10 days
| | | | * | Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/gameloopWBoerenkamps10 days
| | | | |\ \
| | | | * | | fps fix + regression testWBoerenkamps10 days
| | | * | | | bugfix animatorsystemheavydemon219 days
| | | | |/ / | | | |/| |
| | * | | | make formatJAROWMR9 days
| | * | | | moved code to cppJAROWMR9 days
| | * | | | added scene to cmakeJAROWMR9 days
| | * | | | added feedbackJAROWMR9 days
| | * | | | moved mediator upJAROWMR9 days
| | * | | | removed merge includeJAROWMR10 days
| | * | | | Merge branch 'jaro/mediator_concealing_scene' of github.com:lonkaars/crepe in...JAROWMR10 days
| | |\ \ \ \
| | | * | | | formatJAROWMR10 days
| | * | | | | fixed includesJAROWMR10 days
| | |/ / / /
| | * / / / shielded mediatorJAROWMR10 days
| | |/ / /
| | * | | Merge pull request #64 from lonkaars/jaro/physics-system-improvementJaro10 days
| | |\ \ \
| | | * | | revertedJAROWMR10 days
| | | * | | change get fixed_dt to floatJAROWMR10 days
| | | * | | made better readableJAROWMR10 days
| | | * | | updated test valuesJAROWMR10 days
| | | * | | updated constraintsJAROWMR10 days
| | | * | | change get dtJAROWMR10 days
| | | * | | Merge branch 'master' of github.com:lonkaars/crepe into jaro/physics-system-i...JAROWMR10 days
| | | |\ \ \ | | | |/ / / | | |/| | |
| | | * | | make formatJAROWMR10 days
| | | * | | reverted fileJAROWMR10 days
| | | * | | added rotation for previewJAROWMR10 days
| | | * | | removed merge fileJAROWMR10 days
| | | * | | fixed gameJAROWMR10 days
| | | * | | updated testJAROWMR10 days