(e9f10995d) Merge branch 'bugreporterUI' into dev

This commit is contained in:
Joonas Rikkonen
2019-05-18 17:43:00 +03:00
parent 3a2310e547
commit 78b67de866
52 changed files with 428 additions and 223 deletions
@@ -339,7 +339,7 @@ namespace Barotrauma
Font.DrawString(spriteBatch,
Wrap ? wrappedText : text,
rect.Location.ToVector2() + textPos + TextOffset,
pos,
textColor * (textColor.A / 255.0f),
0.0f, origin, TextScale,
SpriteEffects.None, textDepth);