(683b11c00) High-res shuttle preview images + merge fix

2019-05-16 07:05:08 +03:00
parent 5438a65852
commit f605651966
43 changed files with 34 additions and 3476 deletions
@@ -4,7 +4,6 @@ using Barotrauma.Tutorials;
 using Lidgren.Network;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using Microsoft.Xna.Framework.Input;
 using System;
 using System.Diagnostics;
 using System.IO;
@@ -779,8 +778,6 @@ namespace Barotrauma

            GUI.Draw(Cam, spriteBatch);

-            GUI.Draw(Cam, spriteBatch);
-            
 #if DEBUG
            GUI.Font.DrawString(spriteBatch, "Barotrauma v" + GameMain.Version + " (debug build)", new Vector2(10, GameMain.GraphicsHeight - 20), Color.White);
 #else
@@ -859,7 +856,6 @@ namespace Barotrauma
                GameModePreset.List.Find(g => g.Identifier == "singleplayercampaign"));
            (GameMain.GameSession.GameMode as CampaignMode).GenerateMap(mapSeed);

-
            GameMain.LobbyScreen.Select();
        }