Merge branch 'master' into Respawning

# Conflicts: # resources/Schema/Types/Entity.xsd
2016-03-02 16:51:24 +01:00
parent 91dbbb9c11 f8f4b4d939
commit 4ef76f6c45
14 changed files with 9662 additions and 44 deletions
@@ -13,7 +13,8 @@ struct Captured : Event
 {
    int TeamNumberThatCapturedCapturePoint;
    EntityID CapturePointTakenID;
-    EntityWrapper NextCapturePoint;
+    EntityWrapper BlueTeamNextCapturePoint;
+    EntityWrapper RedTeamNextCapturePoint;
 };

 }