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

This commit is contained in:
Joonas Rikkonen
2019-05-16 05:33:13 +03:00
parent a3db11876b
commit e367f900b8
54 changed files with 1092 additions and 297 deletions
@@ -30,6 +30,7 @@ namespace Barotrauma
[STAThread]
static void Main()
{
SteamManager.Initialize();
GameMain game = null;
#if !DEBUG
try