(8df97f638) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

This commit is contained in:
Joonas Rikkonen
2019-05-06 11:35:46 +03:00
parent 26eaf244ed
commit 029f5fccda
14 changed files with 281 additions and 66 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;