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

(372c6e60a) More automatic text scaling + merge fix

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Screens/CampaignSetupUI.cs
-235
View File
@@ -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;
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;
@@ -765,8 +764,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
@@ -842,7 +839,6 @@ namespace Barotrauma
GameModePreset.List.Find(g => g.Identifier == "singleplayercampaign"));
(GameMain.GameSession.GameMode as CampaignMode).GenerateMap(mapSeed);
GameMain.LobbyScreen.Select();
}
Barotrauma/BarotraumaClient/Source/Screens/ServerListScreen.cs
+4 -1
View File
@@ -60,7 +60,10 @@ namespace Barotrauma
var infoHolder = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.5f), leftColumn.RectTransform)) { RelativeSpacing = 0.05f };
new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.3f), infoHolder.RectTransform, Anchor.Center), TextManager.Get("JoinServer"), font: GUI.LargeFont)
{ ForceUpperCase = true };
{
ForceUpperCase = true,
AutoScale = true
};
new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), infoHolder.RectTransform), TextManager.Get("YourName"));
clientNameBox = new GUITextBox(new RectTransform(new Vector2(1.0f, 0.13f), infoHolder.RectTransform), "")
Barotrauma/BarotraumaClient/Source/Screens/SubEditorScreen.cs
+2 -2
View File
@@ -257,12 +257,12 @@ namespace Barotrauma
saveAssemblyFrame = new GUIFrame(new RectTransform(new Vector2(0.08f, 0.5f), TopPanel.RectTransform, Anchor.BottomLeft, Pivot.TopLeft)
{ MinSize = new Point(180, 40), AbsoluteOffset = new Point(LeftPanel.Rect.Width + hullVolumeFrame.Rect.Width, 0) }, "InnerFrame")
{ MinSize = new Point(200, 40), AbsoluteOffset = new Point(LeftPanel.Rect.Width + hullVolumeFrame.Rect.Width, 0) }, "InnerFrame")
{
Visible = false
};
var saveAssemblyButton = new GUIButton(new RectTransform(new Vector2(0.9f, 0.8f), saveAssemblyFrame.RectTransform, Anchor.Center), TextManager.Get("SaveItemAssembly"));
saveAssemblyFrame.Font = GUI.SmallFont;
saveAssemblyButton.TextBlock.AutoScale = true;
saveAssemblyButton.OnClicked += (btn, userdata) =>
{
CreateSaveAssemblyScreen();