Launcher bugfixes, fixed submarine position syncing, previewing the sub after round ends, wiring bugfix, slower reactor overheat, itemlabel, wifi components
This commit is contained in:
@@ -301,8 +301,16 @@ namespace Subsurface
|
||||
spriteBatch.DrawString(Font,
|
||||
"Physics: " + Game1.World.UpdateTime
|
||||
+ " - bodies: " + Game1.World.BodyList.Count
|
||||
+ "Camera pos: " + Game1.GameScreen.Cam.Position,
|
||||
+ " Camera pos: " + Game1.GameScreen.Cam.Position,
|
||||
new Vector2(10, 30), Color.White);
|
||||
|
||||
if (Submarine.Loaded!=null)
|
||||
{
|
||||
spriteBatch.DrawString(Font,
|
||||
"Sub pos: " + Submarine.Loaded.Position,
|
||||
new Vector2(10, 50), Color.White);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -15,6 +15,12 @@ namespace Subsurface
|
||||
//GUIFrame frame;
|
||||
public GUIButton[] Buttons;
|
||||
|
||||
public string Text
|
||||
{
|
||||
get { return (children[1] as GUITextBlock).Text; }
|
||||
set { (children[1] as GUITextBlock).Text = value; }
|
||||
}
|
||||
|
||||
public GUIMessageBox(string header, string text)
|
||||
: this(header, text, new string[] {"OK"})
|
||||
{
|
||||
|
||||
@@ -120,11 +120,7 @@ namespace Subsurface
|
||||
if (parent != null)
|
||||
parent.AddChild(this);
|
||||
|
||||
//if (wrap)
|
||||
//{
|
||||
this.Wrap = wrap;
|
||||
// this.text = ToolBox.WrapText(this.text, rect.Width);
|
||||
//}
|
||||
this.Wrap = wrap;
|
||||
|
||||
SetTextPos();
|
||||
}
|
||||
@@ -138,7 +134,7 @@ namespace Subsurface
|
||||
if (Wrap && rect.Width>0)
|
||||
{
|
||||
//text = text.Replace("\n"," ");
|
||||
text = ToolBox.WrapText(text, rect.Width, Font);
|
||||
text = ToolBox.WrapText(text, rect.Width - padding.X - padding.Z, Font);
|
||||
|
||||
Vector2 newSize = MeasureText(text);
|
||||
|
||||
|
||||
@@ -146,6 +146,7 @@ namespace Subsurface
|
||||
|
||||
public void Deselect()
|
||||
{
|
||||
Selected = false;
|
||||
if (keyboardDispatcher.Subscriber == this) keyboardDispatcher.Subscriber = null;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user