(deebc187d) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-05-16 06:25:48 +03:00
parent bf57a48c7e
commit 7ceba13e8f
28 changed files with 495 additions and 179 deletions
@@ -103,7 +103,7 @@ namespace Barotrauma.Items.Components
                if (textBlock == null)
                {
                    textBlock = new GUITextBlock(new RectTransform(item.Rect.Size), "",
-                        textColor: textColor, font: GUI.SmallFont, textAlignment: Alignment.Center, wrap: true, style: null)
+                        textColor: textColor, font: GUI.UnscaledSmallFont, textAlignment: Alignment.Center, wrap: true, style: null)
                    {
                        TextDepth = item.SpriteDepth - 0.0001f,
                        TextScale = TextScale