verysecrethero b098bd2bd3 Merge remote-tracking branch 'origin/master' into ShootEvent ...

# 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/PlayerSystem.cpp
#	src/Tests/HealthSystemTest.cpp
#	src/Tests/OctTreeTestAnders.cpp
#	src/Tests/OctTreeTestGameClass.cpp
#	src/Tests/OctTreeTestGameClass.h
#	src/Tests/OctTreeTestHardCodedTestWorld.h

2016-01-20 17:53:33 +01:00

..

Engine

Merge remote-tracking branch 'origin/master' into ShootEvent

2016-01-20 17:53:33 +01:00

Game

CapturePointTimers are now reset for "inactive" CapturePoints after a capture.

2016-01-20 17:32:20 +01:00