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

2019-05-16 06:12:40 +03:00
parent c3021b65ad
commit 4d3cea1aa2
13 changed files with 329 additions and 733 deletions
@@ -432,6 +432,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

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