(2a4bd39c2) Merge branch 'dev' into human-ai

2019-05-16 05:33:13 +03:00
parent a3db11876b
commit e367f900b8
54 changed files with 1092 additions and 297 deletions
@@ -7,15 +7,7 @@ namespace Barotrauma.Steam
 {
    partial class SteamManager
    {
-#if DEBUG
-        public static bool USE_STEAM
-        {
-            get { return GameMain.Config.UseSteam; }
-        }
-#else
-        //cannot enable/disable steam in release builds
        public const bool USE_STEAM = true;
-#endif

        public const uint AppID = 602960;