(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
@@ -30,6 +30,7 @@ namespace Barotrauma
[STAThread]
static void Main()
{
SteamManager.Initialize();
GameMain game = null;
#if !DEBUG
try