(683b11c00) High-res shuttle preview images + merge fix

2019-05-16 07:05:08 +03:00
parent 5438a65852
commit f605651966
43 changed files with 34 additions and 3476 deletions
@@ -483,7 +483,6 @@ namespace Barotrauma
                    (int)(GUI.SmallFont.MeasureString(toolTipBlock.WrappedText).Y + padding.Y));
                toolTipBlock.userData = toolTip;
            }
-            toolTipBlock.SetTextPos();

            toolTipBlock.RectTransform.AbsoluteOffset = new Point(targetElement.Center.X, targetElement.Bottom);
            if (toolTipBlock.Rect.Right > GameMain.GraphicsWidth - 10)
@@ -564,7 +563,6 @@ namespace Barotrauma
            RectTransform.LocalScale = startScale;
            yield return CoroutineStatus.Success;
        }
-        #endregion

        public virtual void ApplyStyle(GUIComponentStyle style)
        {