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

2019-05-16 06:30:59 +03:00
parent 4d3e3ca0a2
commit 4fa3d8e41a
12 changed files with 401 additions and 110 deletions
@@ -560,6 +560,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

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