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

2019-05-16 06:21:10 +03:00
parent 48070a3f90
commit fcd95da483
14 changed files with 344 additions and 133 deletions
@@ -492,6 +492,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

+        private GUILayoutGroup subPreviewContainer;
+
        private GUIButton loadGameButton;
        
        public Action<Submarine, string, string> StartNewGame;
@@ -789,6 +789,10 @@ namespace Barotrauma

            GUI.Draw(Cam, spriteBatch);

+            spriteBatch.Begin(SpriteSortMode.Deferred, null, null, null, GameMain.ScissorTestEnable);
+
+            GUI.Draw(Cam, spriteBatch);
+
            GUI.Draw(Cam, spriteBatch);
            
 #if DEBUG