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

2019-05-16 05:52:21 +03:00
parent f8a0d54449
commit 71685ef28c
13 changed files with 320 additions and 573 deletions
@@ -288,6 +288,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

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