(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
@@ -1960,6 +1960,8 @@ namespace Barotrauma.Networking
                msg.Write(false);
            }

+            msg.Write(serverSettings.AllowRagdollButton);
+
            serverSettings.WriteMonsterEnabled(msg);

            CompressOutgoingMessage(msg);