Merge branch 'dev' of https://github.com/Regalis11/Barotrauma.git into unstable-tests

2022-04-08 12:52:28 -03:00
parent 0702d41a73 164d72ae3a
commit ccf5600ad1
990 changed files with 44338 additions and 38589 deletions
@@ -13,8 +13,6 @@ namespace Barotrauma.Networking
        public const int ServerNameMaxLength = 60;
        public const int ServerMessageMaxLength = 2000;

-        public static string MasterServerUrl = GameMain.Config.MasterServerUrl;
-
        public const float MaxPhysicsBodyVelocity = 64.0f;
        public const float MaxPhysicsBodyAngularVelocity = 16.0f;