e6715d6...5d2c9f2
commit 5d2c9f2e19d9d876d606415667f56c1f92fd1b8f Author: ezjamsen <ezjames.fi@gmail.com> Date: Tue Mar 5 19:35:34 2019 +0200 corrected cases commit cd9cf4ed3117b9a5cc4cb57428d8dc11d756d274 Author: ezjamsen <ezjames.fi@gmail.com> Date: Tue Mar 5 19:01:54 2019 +0200 updated settings commit 84ad07149a8e56d59fd2d71b34fbb92479eba042 Author: Iiro Enges <iiro@fakefish.fi> Date: Tue Mar 5 18:48:26 2019 +0200 Added an updated title text commit 0ae68b0857ee259cac1480cb20a9c02f3bb88d8d Author: Iiro Enges <iiro@fakefish.fi> Date: Tue Mar 5 18:46:59 2019 +0200 Replaced old alien ruin textures with new ones (more variants to be added) commit b57a6765f56ea1504ff5b39b14172f73b4122597 Author: Joonas Rikkonen <poe.regalis@gmail.com> Date: Tue Mar 5 17:44:46 2019 +0200 Fixed particle jitter caused by a bug in the interpolation logic (was especially noticeable when the sub is moving fast)
This commit is contained in:
@@ -626,28 +626,6 @@ namespace Barotrauma
|
||||
|
||||
new GUIMessageBox(TextManager.Get("RestartRequiredLabel"), TextManager.Get("RestartRequiredLanguage"));
|
||||
|
||||
return true;
|
||||
};
|
||||
|
||||
//spacing
|
||||
new GUIFrame(new RectTransform(new Vector2(1.0f, 0.02f), generalLayoutGroup.RectTransform), style: null);
|
||||
|
||||
new GUIButton(new RectTransform(new Vector2(0.4f, 1.0f), buttonArea.RectTransform, Anchor.BottomLeft),
|
||||
TextManager.Get("Cancel"))
|
||||
{
|
||||
IgnoreLayoutGroups = true,
|
||||
OnClicked = (x, y) =>
|
||||
{
|
||||
if (UnsavedSettings)
|
||||
{
|
||||
LoadPlayerConfig();
|
||||
}
|
||||
if (Screen.Selected == GameMain.MainMenuScreen) GameMain.MainMenuScreen.ReturnToMainMenu(null, null);
|
||||
GUI.SettingsMenuOpen = false;
|
||||
return true;
|
||||
}
|
||||
};
|
||||
|
||||
//spacing
|
||||
new GUIFrame(new RectTransform(new Vector2(1.0f, 0.02f), generalLayoutGroup.RectTransform), style: null);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user