Merge branch 'master' of https://github.com/Regalis11/Barotrauma

2017-12-21 20:31:24 -03:00
parent 064c8da7e7 ac53c5f80d
commit 47b5ccd7c6
23 changed files with 347 additions and 190 deletions
@@ -436,7 +436,7 @@ namespace Barotrauma

            InfoFrame.FindChild("showlog").Visible = GameMain.Server != null;
            
-            campaignViewButton = new GUIButton(new Rectangle(0, 0, 130, 30), "Campaign view", Alignment.BottomRight, "", defaultModeContainer);
+            campaignViewButton = new GUIButton(new Rectangle(-80, 0, 120, 30), "Campaign view", Alignment.BottomRight, "", defaultModeContainer);
            campaignViewButton.OnClicked = (btn, obj) => { ToggleCampaignView(true); return true; };
            campaignViewButton.Visible = false;