(133a5b1da) Merge branch 'dev' into human-ai

2019-05-16 05:27:51 +03:00
parent ab49749f8b
commit 3bce90251a
17 changed files with 150 additions and 238 deletions
@@ -114,6 +114,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

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