4 Commits

Author	SHA1	Message	Date
verysecrethero	b45de542da	CapturePointSystem updated, all tests are green	2016-01-19 17:19:58 +01:00
verysecrethero	f197993beb	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
verysecrethero	4c1a49a8a4	Merge remote-tracking branch 'origin/master' into CapturePointTake ... # Conflicts: # include/Engine/Core/ComponentWrapper.h # include/Game/PlayerSystem.h # include/Game/Systems/HealthSystem.h # resources/Schema/Components.xsd # resources/Schema/Components/Player.xml # resources/Schema/Types/Entity.xsd # src/Game/CMakeLists.txt # src/Game/PlayerSystem.cpp # src/Game/Systems/HealthSystem.cpp # src/Tests/OctTreeTestGameClass.cpp # src/Tests/OctTreeTestGameClass.h # src/Tests/OctTreeTestGameMain.cpp # src/Tests/OctTreeTestHardCodedTestWorld.h	2016-01-18 16:48:49 +01:00
Jace	6ad1839def	Initial work on PlayerMovementSystem	2016-01-14 17:03:48 +01:00