(048b753e6) Merge branch 'dev' into human-ai

2019-05-16 05:20:29 +03:00
parent 7b6c2f1fa8
commit 3d7a113d75
47 changed files with 651 additions and 461 deletions
@@ -1079,6 +1079,8 @@ namespace Barotrauma.Networking
            bool isTraitor          = inc.ReadBoolean();
            string traitorTargetName = isTraitor ? inc.ReadString() : null;

+            bool allowRagdollButton = inc.ReadBoolean();
+
            serverSettings.ReadMonsterEnabled(inc);

            GameModePreset gameMode = GameModePreset.List.Find(gm => gm.Identifier == modeIdentifier);
@@ -1095,6 +1097,7 @@ namespace Barotrauma.Networking
            GameMain.LightManager.LosMode = (LosMode)losMode;

            serverSettings.AllowDisguises = disguisesAllowed;
+            serverSettings.AllowRagdollButton = allowRagdollButton;

            if (campaign == null)
            {