Merge branch 'master' into Respawning

2016-03-02 13:47:03 +01:00
parent 629ebb871f 2fb3bb2a39
commit 06d60f9884
36 changed files with 1430 additions and 522 deletions
@@ -12,7 +12,8 @@ namespace Events
 struct Captured : Event
 {
    int TeamNumberThatCapturedCapturePoint;
-    EntityID CapturePointID;
+    EntityID CapturePointTakenID;
+    EntityWrapper NextCapturePoint;
 };

 }