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

Sending NetTime at the start of a combined networkevent instead of individual networkevents, syncing itemcomponents for spectators, AICharacter importantentityupdates are sent again, misc bugfixes, some new heads

Browse Source
This commit is contained in:
Regalis
2015-11-20 17:12:33 +02:00
parent 8ec7fd44ff
commit cddf4f1bde
37 changed files with 269 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,7 +122,7 @@ namespace Barotrauma
scrollBarHidden = true;
scrollBar = new GUIScrollBar(
new Rectangle(this.rect.X + this.rect.Width-20, this.rect.Y, 20, this.rect.Height), color, 1.0f, style);
new Rectangle(this.rect.X + this.rect.Width-20, this.rect.Y, 20, this.rect.Height), color, 1.0f, GUI.Style);
frame = new GUIFrame(Rectangle.Empty, style, this);
if (style != null) style.Apply(frame, this);

4
Subsurface/Source/GUI/GUITextBlock.cs
View File

@@ -203,8 +203,10 @@ namespace Barotrauma
}
private Vector2 MeasureText(string text)
private Vector2 MeasureText(string text)
{
if (string.IsNullOrEmpty(text) || Font==null) return Vector2.Zero;
Vector2 size = Vector2.Zero;
while (size == Vector2.Zero)
{

5
Subsurface/Source/GUI/TitleScreen.cs
View File

@@ -99,7 +99,10 @@ namespace Barotrauma
graphics.SetRenderTarget(null);
Hull.renderer.RenderBack(spriteBatch, renderTarget, 0.0f);
if (Hull.renderer != null)
{
Hull.renderer.RenderBack(spriteBatch, renderTarget, 0.0f);
}
spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.NonPremultiplied);