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

2019-03-27 20:58:04 +02:00
parent 0ab2f2ac69
commit e6c3d6d537
12 changed files with 11 additions and 9563 deletions
@@ -467,11 +467,7 @@ namespace Barotrauma
                    {
                        itemsText.Text += TextManager.Get("None");
                    }
-                };
-                new GUIButton(new RectTransform(new Vector2(0.25f, 1.0f), buttonContainer.RectTransform), TextManager.Get("MirrorEntityY"))
-                {
-                    ToolTip = TextManager.Get("MirrorEntityYToolTip"),
-                    OnClicked = (button, data) =>
+                    else
                    {
                        for (int i = 0; i < AllowedLinks.Count; i++)
                        {