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

Merge branch 'master' into new-netcode

Browse Source 
Conflicts:
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Items/Components/Signal/Wire.cs
	Subsurface/Source/Items/Item.cs
	Subsurface/Source/Items/ItemInventory.cs
	Subsurface/Source/Networking/GameServer.cs
This commit is contained in:
Regalis
2016-11-09 17:58:56 +02:00
parent 9eaca68cea d017817878
commit ac65a431a8
25 changed files with 486 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/DebugConsole.cs
+6 -1
View File
@@ -27,7 +27,7 @@ namespace Barotrauma
static class DebugConsole
{
const int MaxMessages = 100;
const int MaxMessages = 200;
public static List<ColoredText> Messages = new List<ColoredText>();
@@ -757,6 +757,11 @@ namespace Barotrauma
//listbox not created yet, don't attempt to add
if (listBox == null) return;
if (listBox.children.Count > MaxMessages)
{
listBox.children.RemoveRange(0, listBox.children.Count - MaxMessages);
}
try
{
var textBlock = new GUITextBlock(new Rectangle(0, 0, listBox.Rect.Width, 0), msg, GUI.Style, Alignment.TopLeft, Alignment.Left, null, true, GUI.SmallFont);