William Moberg e3a44d37d2 Merge branch 'master' into BoxModelCollision ...

# Conflicts:
#	src/Game/Systems/PlayerMovementSystem.cpp

2016-02-05 14:59:14 +01:00

..

Systems

Merge branch 'master' into BoxModelCollision

2016-02-05 14:59:14 +01:00

CMakeLists.txt

Changed CapturePointSystem in light of new enums in the components and a teamcomponent. Half the tests are currently working

2016-01-19 15:31:15 +01:00

Game.cpp

Several changes/fixes based on the latest broken refactoring.

2016-02-02 11:37:22 +01:00

main.cpp

Engine puzzle completed

2015-11-30 17:02:24 +01:00