(774a92f5e) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-05-16 06:44:10 +03:00
parent 49b0ee7c50
commit 38b7d326d6
11 changed files with 350 additions and 120 deletions
@@ -652,6 +652,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

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