5 Commits

Author	SHA1	Message	Date
Jace	a6548a72b3	Merge remote-tracking branch 'origin/master' into EditorUsefulness ... # Conflicts: # include/Engine/Collision/CollidableOctreeSystem.h # include/Engine/Collision/CollisionSystem.h # include/Engine/Collision/TriggerSystem.h # include/Engine/Rendering/RenderSystem.h # include/Game/Systems/PlayerSystem.h # resources/Schema/Components/Physics.xsd # resources/Schema/Types/Entity.xsd # src/Engine/Rendering/RenderSystem.cpp # src/Engine/Rendering/Renderer.cpp # src/Game/Game.cpp # src/Game/Systems/HealthSystem.cpp # src/Game/Systems/PlayerSystem.cpp # src/Tests/OctTreeTestGameClass.cpp	2016-01-21 16:16:35 +01:00
verysecrethero	a596b8746b	CapturePointTimers are now reset for "inactive" CapturePoints after a capture.	2016-01-20 17:32:20 +01:00
verysecrethero	35876f6425	Removed membervariable m_NextPossibleCapturePointand added it as local instead	2016-01-20 16:37:10 +01:00
verysecrethero	8189e3c00c	Logic in CapturePointSystem is working again. Need to update all Tests!	2016-01-20 14:59:18 +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