(0f4d3b087) Merge branch 'dev' into human-ai

2019-05-16 05:29:17 +03:00
parent 9334b71939
commit 49ad45f34d
7 changed files with 260 additions and 141 deletions
@@ -124,6 +124,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

+        private GUILayoutGroup subPreviewContainer;
+
        private GUIButton loadGameButton;
        
        public Action<Submarine, string, string> StartNewGame;