From 528d79be51f8e3605be711c884d5e90ddfecce27 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 19 May 2017 22:53:08 +0900 Subject: [PATCH 1/3] FrameworkDebugConfig -> DebugSetting --- osu.Game/Overlays/Settings/Sections/Debug/GCSettings.cs | 2 +- osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/osu.Game/Overlays/Settings/Sections/Debug/GCSettings.cs b/osu.Game/Overlays/Settings/Sections/Debug/GCSettings.cs index 29b96a59c2..0a32b50809 100644 --- a/osu.Game/Overlays/Settings/Sections/Debug/GCSettings.cs +++ b/osu.Game/Overlays/Settings/Sections/Debug/GCSettings.cs @@ -22,7 +22,7 @@ namespace osu.Game.Overlays.Settings.Sections.Debug new SettingsEnumDropdown { LabelText = "Active mode", - Bindable = config.GetBindable(FrameworkDebugConfig.ActiveGCMode) + Bindable = config.GetBindable(DebugSetting.ActiveGCMode) }, new OsuButton { diff --git a/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs index 9fbb4011b7..ca883f41d7 100644 --- a/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs +++ b/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs @@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Settings.Sections.Debug new SettingsCheckbox { LabelText = "Bypass caching", - Bindable = config.GetBindable(FrameworkDebugConfig.BypassCaching) + Bindable = config.GetBindable(DebugSetting.BypassCaching) } }; } From 9aca8fc843154ad6a969d06f02f1c568069d16ef Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Sat, 20 May 2017 00:43:17 +0900 Subject: [PATCH 2/3] Update framework --- osu-framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu-framework b/osu-framework index f8e5b10f68..4c76571784 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit f8e5b10f6883af83ffbc431b03fe4ee3e89797a6 +Subproject commit 4c765717846fef9a141800782a5a968c2bc3a278 From a34d9d8b09ed856018cabf6344577f30223021bf Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Sat, 20 May 2017 01:14:51 +0900 Subject: [PATCH 3/3] Oops --- osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs index 970e2b9bfc..c042aeb19b 100644 --- a/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs +++ b/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs @@ -24,7 +24,7 @@ namespace osu.Game.Overlays.Settings.Sections.Debug new SettingsCheckbox { LabelText = "Debug logs", - Bindable = frameworkConfig.GetBindable(DebugSetting.ShowLogOverlay) + Bindable = frameworkConfig.GetBindable(FrameworkSetting.ShowLogOverlay) } }; }