William Moberg e6b3bbeb54 Merge remote-tracking branch 'origin/master' into Respawning ...

# Conflicts:
#	resources/Schema/Types/Entity.xsd

2016-03-02 17:50:59 +01:00

..

Engine

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

2016-03-02 17:50:59 +01:00

Game

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

2016-03-02 17:50:59 +01:00

Tests

CapturePointSystem fix, DamageIndicatorSystem fix

2016-02-23 17:29:33 +01:00