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

updated changelog, transparent debug console frame, stuff

Browse Source
This commit is contained in:
Regalis
2016-08-08 23:32:14 +03:00
parent 4713f59efb
commit d4338580c7
6 changed files with 73 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Subsurface/Source/Characters/CharacterHUD.cs
View File

@@ -193,6 +193,7 @@ namespace Barotrauma
suicideButton.OnClicked = (button, userData) =>
{
GUIComponent.MouseOn = null;
if (Character.Controlled != null)
{
Character.Controlled.Kill(Character.Controlled.CauseOfDeath);

7
Subsurface/Source/DebugConsole.cs
View File

@@ -58,9 +58,12 @@ namespace Barotrauma
frame.Color = Color.White * 0.4f;
frame.Padding = new Vector4(5.0f, 5.0f, 5.0f, 5.0f);
listBox = new GUIListBox(new Rectangle(0,0,0, frame.Rect.Height-40), Color.Black*0.9f, GUI.Style, frame);
listBox = new GUIListBox(new Rectangle(0, 0, 0, frame.Rect.Height - 40), Color.Black, GUI.Style, frame);
listBox.Color = Color.Black * 0.7f;
textBox = new GUITextBox(new Rectangle(0,0,0,20), Color.Black, Color.White, Alignment.BottomLeft, Alignment.Left, GUI.Style, frame);
textBox.Color = Color.Black * 0.7f;
textBox = new GUITextBox(new Rectangle(0,0,0,20), Color.Black*0.6f, Color.White, Alignment.BottomLeft, Alignment.Left, GUI.Style, frame);
NewMessage("Press F3 to open/close the debug console", Color.Cyan);
NewMessage("Enter ''help'' for a list of available console commands", Color.Cyan);

14
Subsurface/Source/GUI/GUIListBox.cs
View File

@@ -84,6 +84,20 @@ namespace Barotrauma
set { enabled = value; }
}
public override Color Color
{
get
{
return base.Color;
}
set
{
base.Color = value;
frame.Color = value;
}
}
public bool ScrollBarEnabled
{
get { return scrollBarEnabled; }

2
Subsurface/Source/Utils/ToolBox.cs
View File

@@ -413,7 +413,7 @@ namespace Barotrauma
public static string SecondsToReadableTime(float seconds)
{
if (seconds <= 60.0f)
if (seconds < 60.0f)
{
return (int)seconds + " s";
}