(d7a4efa97) Merge branch 'human-ai' into dev

2019-05-16 06:19:27 +03:00
parent e8ee3f9d18
commit 69494dcde8
15 changed files with 358 additions and 157 deletions
@@ -480,6 +480,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

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