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

# Conflicts: # src/Engine/Network/Server.cpp
2016-03-09 18:41:01 +01:00
parent 3209e36176 3436ba6656
commit c36c7d1ea6
17 changed files with 4634 additions and 4186 deletions
@@ -656,7 +656,8 @@ bool Server::shouldSendToClient(EntityWrapper childEntity)
        || childEntity.HasComponent("HealthPickup")
        || childEntity.HasComponent("AmmoPickup")
        || childEntity.HasComponent("ScoreScreen")
-        || childEntity.FirstParentWithComponent("ScoreScreen").Valid();
+        || childEntity.FirstParentWithComponent("ScoreScreen").Valid()
+        || childEntity.FirstParentWithComponent("CapturePoint").Valid();
 }

 PlayerID Server::getPlayerIDFromEndpoint()