vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-05-16 07:05:08 +03:00
parent 5438a65852
commit f605651966
43 changed files with 34 additions and 3476 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Screens/CampaignSetupUI.cs
-781
View File
@@ -16,779 +16,6 @@ namespace Barotrauma
private GUIListBox saveList;
private GUITextBox saveNameBox, seedBox;
private GUITickBox contextualTutorialBox;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
private GUILayoutGroup subPreviewContainer;
@@ -796,14 +23,6 @@ namespace Barotrauma
public Action<Submarine, string, string> StartNewGame;
public Action<string> LoadGame;
public bool TutorialSelected
{
get
{
if (contextualTutorialBox == null) return false;
return contextualTutorialBox.Selected;
}
}
private readonly bool isMultiplayer;
Barotrauma/BarotraumaClient/Source/Screens/CharacterEditorScreen.cs
-3
View File
@@ -131,9 +131,6 @@ namespace Barotrauma
{
GameMain.Instance.ShowEditorDisclaimer();
}
OpenDoors();
GameMain.Instance.OnResolutionChanged += OnResolutionChanged;
instance = this;
}
private void ResetVariables()
Barotrauma/BarotraumaClient/Source/Screens/MainMenuScreen.cs
-4
View File
@@ -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();
}
Barotrauma/BarotraumaClient/Source/Screens/SubEditorScreen.cs
-1
View File
@@ -1205,7 +1205,6 @@ namespace Barotrauma
AbsoluteSpacing = 5,
Stretch = true
};
#endif
new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), paddedSaveFrame.RectTransform),
TextManager.Get("SaveItemAssemblyDialogHeader"), font: GUI.LargeFont);