(372c6e60a) More automatic text scaling + merge fix

This commit is contained in:
Joonas Rikkonen
2019-05-06 14:14:30 +03:00
parent 7d825b051c
commit 5af8170ac6
20 changed files with 21 additions and 630 deletions
@@ -16,233 +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;
@@ -250,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;