From a7d16ac21334e690c42222844fea8764bd278799 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 19 May 2017 18:18:21 +0900 Subject: [PATCH 01/11] Move skip logic to inside SkipButton --- .../Tests/TestCaseTwoLayerButton.cs | 2 +- osu.Game/Screens/Play/Player.cs | 33 ++----------------- osu.Game/Screens/Play/SkipButton.cs | 25 +++++++++++++- 3 files changed, 27 insertions(+), 33 deletions(-) diff --git a/osu.Desktop.VisualTests/Tests/TestCaseTwoLayerButton.cs b/osu.Desktop.VisualTests/Tests/TestCaseTwoLayerButton.cs index 2427b6d12c..ba17cfc3d8 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseTwoLayerButton.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseTwoLayerButton.cs @@ -16,7 +16,7 @@ namespace osu.Desktop.VisualTests.Tests base.Reset(); Add(new BackButton()); - Add(new SkipButton()); + Add(new SkipButton(Clock.CurrentTime + 5000)); } } } diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs index d9585b8c04..06c9b29d48 100644 --- a/osu.Game/Screens/Play/Player.cs +++ b/osu.Game/Screens/Play/Player.cs @@ -63,8 +63,6 @@ namespace osu.Game.Screens.Play #endregion - private SkipButton skipButton; - private HUDOverlay hudOverlay; private FailOverlay failOverlay; @@ -169,8 +167,9 @@ namespace osu.Game.Screens.Play Children = new Drawable[] { HitRenderer, - skipButton = new SkipButton + new SkipButton(firstObjectTime) { + AudioClock = decoupledClock, Alpha = 0, Margin = new MarginPadding { Bottom = 140 } // this is temporary }, @@ -219,33 +218,6 @@ namespace osu.Game.Screens.Play scoreProcessor.Failed += onFail; } - private void initializeSkipButton() - { - const double skip_required_cutoff = 3000; - const double fade_time = 300; - - double firstHitObject = Beatmap.Beatmap.HitObjects.First().StartTime; - - if (firstHitObject < skip_required_cutoff) - { - skipButton.Alpha = 0; - skipButton.Expire(); - return; - } - - skipButton.FadeInFromZero(fade_time); - - skipButton.Action = () => - { - decoupledClock.Seek(firstHitObject - skip_required_cutoff - fade_time); - skipButton.Action = null; - }; - - skipButton.Delay(firstHitObject - skip_required_cutoff - fade_time); - skipButton.FadeOut(fade_time); - skipButton.Expire(); - } - public void Restart() { ValidForResume = false; @@ -308,7 +280,6 @@ namespace osu.Game.Screens.Play Schedule(() => { decoupledClock.Start(); - initializeSkipButton(); }); pauseContainer.Alpha = 0; diff --git a/osu.Game/Screens/Play/SkipButton.cs b/osu.Game/Screens/Play/SkipButton.cs index f57bbd4cb0..47f382dc0e 100644 --- a/osu.Game/Screens/Play/SkipButton.cs +++ b/osu.Game/Screens/Play/SkipButton.cs @@ -5,6 +5,7 @@ using osu.Framework.Allocation; using osu.Framework.Audio; using osu.Framework.Graphics; using osu.Framework.Input; +using osu.Framework.Timing; using osu.Game.Graphics; using osu.Game.Graphics.UserInterface; using OpenTK.Input; @@ -13,8 +14,12 @@ namespace osu.Game.Screens.Play { public class SkipButton : TwoLayerButton { - public SkipButton() + private readonly double startTime; + public IAdjustableClock AudioClock; + + public SkipButton(double startTime) { + this.startTime = startTime; Text = @"Skip"; Icon = FontAwesome.fa_osu_right_o; Anchor = Anchor.BottomRight; @@ -27,6 +32,24 @@ namespace osu.Game.Screens.Play ActivationSound = audio.Sample.Get(@"Menu/menuhit"); BackgroundColour = colours.Yellow; HoverColour = colours.YellowDark; + + const double skip_required_cutoff = 3000; + const double fade_time = 300; + + if (startTime < skip_required_cutoff) + { + Alpha = 0; + Expire(); + return; + } + + FadeInFromZero(fade_time); + + Action = () => AudioClock.Seek(startTime - skip_required_cutoff - fade_time); + + Delay(startTime - skip_required_cutoff - fade_time); + FadeOut(fade_time); + Expire(); } protected override bool OnKeyDown(InputState state, KeyDownEventArgs args) From aef82acb0d855349604cabcb4a7284b4e82b17e4 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 19 May 2017 21:54:14 +0900 Subject: [PATCH 02/11] Update skip button design --- osu.Game/Screens/Play/Player.cs | 7 +- osu.Game/Screens/Play/SkipButton.cs | 248 ++++++++++++++++++++++++++-- 2 files changed, 232 insertions(+), 23 deletions(-) diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs index 06c9b29d48..eaa80baa9d 100644 --- a/osu.Game/Screens/Play/Player.cs +++ b/osu.Game/Screens/Play/Player.cs @@ -166,13 +166,8 @@ namespace osu.Game.Screens.Play Clock = offsetClock, Children = new Drawable[] { + new SkipButton(firstObjectTime) { AudioClock = decoupledClock, Depth = 1 }, HitRenderer, - new SkipButton(firstObjectTime) - { - AudioClock = decoupledClock, - Alpha = 0, - Margin = new MarginPadding { Bottom = 140 } // this is temporary - }, } }, hudOverlay = new StandardHUDOverlay diff --git a/osu.Game/Screens/Play/SkipButton.cs b/osu.Game/Screens/Play/SkipButton.cs index 47f382dc0e..9b42e63227 100644 --- a/osu.Game/Screens/Play/SkipButton.cs +++ b/osu.Game/Screens/Play/SkipButton.cs @@ -1,40 +1,92 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +using System; +using osu.Framework; using osu.Framework.Allocation; -using osu.Framework.Audio; using osu.Framework.Graphics; +using osu.Framework.Graphics.Containers; +using osu.Framework.Graphics.Sprites; using osu.Framework.Input; +using osu.Framework.Threading; using osu.Framework.Timing; using osu.Game.Graphics; -using osu.Game.Graphics.UserInterface; +using osu.Game.Graphics.Sprites; +using osu.Game.Screens.Ranking; +using OpenTK; +using OpenTK.Graphics; using OpenTK.Input; namespace osu.Game.Screens.Play { - public class SkipButton : TwoLayerButton + public class SkipButton : Container { private readonly double startTime; public IAdjustableClock AudioClock; + private Button button; + private Box remainingTimeBox; + + private FadeContainer fadeContainer; + private double displayTime; + public SkipButton(double startTime) { + AlwaysReceiveInput = true; + this.startTime = startTime; - Text = @"Skip"; - Icon = FontAwesome.fa_osu_right_o; - Anchor = Anchor.BottomRight; - Origin = Anchor.BottomRight; + + RelativePositionAxes = Axes.Both; + RelativeSizeAxes = Axes.Both; + + Position = new Vector2(0.5f, 0.7f); + Size = new Vector2(1, 0.14f); + + Origin = Anchor.Centre; + } + + protected override bool OnMouseMove(InputState state) + { + fadeContainer.State = Visibility.Visible; + return base.OnMouseMove(state); } [BackgroundDependencyLoader] - private void load(AudioManager audio, OsuColour colours) + private void load(OsuColour colours) { - ActivationSound = audio.Sample.Get(@"Menu/menuhit"); - BackgroundColour = colours.Yellow; - HoverColour = colours.YellowDark; + Children = new Drawable[] + { + fadeContainer = new FadeContainer + { + RelativeSizeAxes = Axes.Both, + Children = new Drawable[] + { + button = new Button + { + Anchor = Anchor.Centre, + Origin = Anchor.Centre, + }, + remainingTimeBox = new Box + { + Height = 5, + RelativeSizeAxes = Axes.X, + Colour = colours.Yellow, + Anchor = Anchor.BottomCentre, + Origin = Anchor.BottomCentre, + } + } + } + }; + } - const double skip_required_cutoff = 3000; - const double fade_time = 300; + private const double skip_required_cutoff = 3000; + private const double fade_time = 300; + + private double beginFadeTime => startTime - skip_required_cutoff - fade_time; + + protected override void LoadComplete() + { + base.LoadComplete(); if (startTime < skip_required_cutoff) { @@ -44,14 +96,22 @@ namespace osu.Game.Screens.Play } FadeInFromZero(fade_time); + using (BeginAbsoluteSequence(beginFadeTime)) + FadeOut(fade_time); - Action = () => AudioClock.Seek(startTime - skip_required_cutoff - fade_time); + button.Action = () => AudioClock?.Seek(startTime - skip_required_cutoff - fade_time); + + displayTime = Time.Current; - Delay(startTime - skip_required_cutoff - fade_time); - FadeOut(fade_time); Expire(); } + protected override void Update() + { + base.Update(); + remainingTimeBox.Width = (float)Math.Max(0, 1 - (Time.Current - displayTime) / (beginFadeTime - displayTime)); + } + protected override bool OnKeyDown(InputState state, KeyDownEventArgs args) { if (args.Repeat) return false; @@ -59,11 +119,165 @@ namespace osu.Game.Screens.Play switch (args.Key) { case Key.Space: - TriggerClick(); + button.TriggerClick(); return true; } return base.OnKeyDown(state, args); } + + private class FadeContainer : Container, IStateful + { + private Visibility state; + private ScheduledDelegate scheduledHide; + + public Visibility State + { + get + { + return state; + } + set + { + var lastState = state; + + state = value; + + scheduledHide?.Cancel(); + + switch (state) + { + case Visibility.Visible: + if (lastState == Visibility.Hidden) + FadeIn(500, EasingTypes.OutExpo); + + if (!Hovering) + using (BeginDelayedSequence(1000)) + scheduledHide = Schedule(() => State = Visibility.Hidden); + break; + case Visibility.Hidden: + FadeOut(1000, EasingTypes.OutExpo); + break; + } + } + } + + protected override void LoadComplete() + { + base.LoadComplete(); + State = Visibility.Visible; + } + } + + private class Button : Container + { + public Action Action; + private Color4 colourNormal; + private Color4 colourHover; + private Box box; + private FillFlowContainer flow; + private Box background; + private AspectContainer aspect; + + public Button() + { + RelativeSizeAxes = Axes.Both; + } + + [BackgroundDependencyLoader] + private void load(OsuColour colours) + { + colourNormal = colours.Yellow; + colourHover = colours.YellowDark; + + Children = new Drawable[] + { + background = new Box + { + Alpha = 0.2f, + Colour = Color4.Black, + RelativeSizeAxes = Axes.Both, + }, + aspect = new AspectContainer + { + Anchor = Anchor.Centre, + Origin = Anchor.Centre, + RelativeSizeAxes = Axes.Y, + Height = 0.6f, + Masking = true, + CornerRadius = 15, + Children = new Drawable[] + { + box = new Box + { + RelativeSizeAxes = Axes.Both, + Colour = colourNormal, + }, + flow = new FillFlowContainer + { + Anchor = Anchor.TopCentre, + RelativePositionAxes = Axes.Y, + Y = 0.4f, + AutoSizeAxes = Axes.Both, + Origin = Anchor.Centre, + Direction = FillDirection.Horizontal, + Children = new [] + { + new TextAwesome { Icon = FontAwesome.fa_chevron_right }, + new TextAwesome { Icon = FontAwesome.fa_chevron_right }, + new TextAwesome { Icon = FontAwesome.fa_chevron_right }, + } + }, + new OsuSpriteText + { + Anchor = Anchor.TopCentre, + RelativePositionAxes = Axes.Y, + Y = 0.7f, + TextSize = 12, + Font = @"Exo2.0-Bold", + Origin = Anchor.Centre, + Text = @"SKIP", + }, + } + } + }; + } + + protected override bool OnHover(InputState state) + { + flow.TransformSpacingTo(new Vector2(5), 500, EasingTypes.OutQuint); + box.FadeColour(colourHover, 500, EasingTypes.OutQuint); + background.FadeTo(0.4f, 500, EasingTypes.OutQuint); + return base.OnHover(state); + } + + protected override void OnHoverLost(InputState state) + { + flow.TransformSpacingTo(new Vector2(0), 500, EasingTypes.OutQuint); + box.FadeColour(colourNormal, 500, EasingTypes.OutQuint); + background.FadeTo(0.2f, 500, EasingTypes.OutQuint); + base.OnHoverLost(state); + } + + protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) + { + aspect.ScaleTo(0.75f, 2000, EasingTypes.OutQuint); + return base.OnMouseDown(state, args); + } + + protected override bool OnMouseUp(InputState state, MouseUpEventArgs args) + { + aspect.ScaleTo(1, 1000, EasingTypes.OutElastic); + return base.OnMouseUp(state, args); + } + + protected override bool OnClick(InputState state) + { + box.FlashColour(Color4.White, 500, EasingTypes.OutQuint); + + Action?.Invoke(); + return true; + } + } } } From 20156d26f9e2a3fe9e5bbeffa32b976dde42c348 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 19 May 2017 22:12:09 +0900 Subject: [PATCH 03/11] Don't rely on parent's clock --- osu.Game/Screens/Play/Player.cs | 2 +- osu.Game/Screens/Play/SkipButton.cs | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs index eaa80baa9d..0ed5a5874c 100644 --- a/osu.Game/Screens/Play/Player.cs +++ b/osu.Game/Screens/Play/Player.cs @@ -160,13 +160,13 @@ namespace osu.Game.Screens.Play }, Children = new Drawable[] { + new SkipButton(firstObjectTime) { AudioClock = decoupledClock }, new Container { RelativeSizeAxes = Axes.Both, Clock = offsetClock, Children = new Drawable[] { - new SkipButton(firstObjectTime) { AudioClock = decoupledClock, Depth = 1 }, HitRenderer, } }, diff --git a/osu.Game/Screens/Play/SkipButton.cs b/osu.Game/Screens/Play/SkipButton.cs index 9b42e63227..09d5dcb81f 100644 --- a/osu.Game/Screens/Play/SkipButton.cs +++ b/osu.Game/Screens/Play/SkipButton.cs @@ -54,6 +54,11 @@ namespace osu.Game.Screens.Play [BackgroundDependencyLoader] private void load(OsuColour colours) { + var baseClock = Clock; + + if (AudioClock != null) + Clock = new FramedClock(AudioClock); + Children = new Drawable[] { fadeContainer = new FadeContainer @@ -63,6 +68,7 @@ namespace osu.Game.Screens.Play { button = new Button { + Clock = baseClock, Anchor = Anchor.Centre, Origin = Anchor.Centre, }, @@ -109,7 +115,7 @@ namespace osu.Game.Screens.Play protected override void Update() { base.Update(); - remainingTimeBox.Width = (float)Math.Max(0, 1 - (Time.Current - displayTime) / (beginFadeTime - displayTime)); + remainingTimeBox.ResizeWidthTo((float)Math.Max(0, 1 - (Time.Current - displayTime) / (beginFadeTime - displayTime)), 120, EasingTypes.OutQuint); } protected override bool OnKeyDown(InputState state, KeyDownEventArgs args) @@ -273,9 +279,10 @@ namespace osu.Game.Screens.Play protected override bool OnClick(InputState state) { - box.FlashColour(Color4.White, 500, EasingTypes.OutQuint); - Action?.Invoke(); + + box.FlashColour(Color4.White, 500, EasingTypes.OutQuint); + aspect.ScaleTo(1.2f, 2000, EasingTypes.OutQuint); return true; } } From 60f960aafd4e1c55bbd8f56df207ecc351807fc8 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 19 May 2017 22:19:20 +0900 Subject: [PATCH 04/11] Fix audio clock breakage. --- osu.Game/Screens/Play/SkipButton.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/Screens/Play/SkipButton.cs b/osu.Game/Screens/Play/SkipButton.cs index 09d5dcb81f..77ace50b29 100644 --- a/osu.Game/Screens/Play/SkipButton.cs +++ b/osu.Game/Screens/Play/SkipButton.cs @@ -57,7 +57,7 @@ namespace osu.Game.Screens.Play var baseClock = Clock; if (AudioClock != null) - Clock = new FramedClock(AudioClock); + Clock = new FramedClock(AudioClock) { ProcessSourceClockFrames = false }; Children = new Drawable[] { From 674731f9bba9a0da9f6061be172156eb4f40168e Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 19 May 2017 22:23:48 +0900 Subject: [PATCH 05/11] Add sound back to skip action --- osu.Game/Screens/Play/SkipButton.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/osu.Game/Screens/Play/SkipButton.cs b/osu.Game/Screens/Play/SkipButton.cs index 77ace50b29..86bbb26412 100644 --- a/osu.Game/Screens/Play/SkipButton.cs +++ b/osu.Game/Screens/Play/SkipButton.cs @@ -4,6 +4,7 @@ using System; using osu.Framework; using osu.Framework.Allocation; +using osu.Framework.Audio; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Sprites; @@ -16,6 +17,7 @@ using osu.Game.Screens.Ranking; using OpenTK; using OpenTK.Graphics; using OpenTK.Input; +using osu.Framework.Audio.Sample; namespace osu.Game.Screens.Play { @@ -184,6 +186,7 @@ namespace osu.Game.Screens.Play private FillFlowContainer flow; private Box background; private AspectContainer aspect; + private SampleChannel activationSound; public Button() { @@ -191,8 +194,10 @@ namespace osu.Game.Screens.Play } [BackgroundDependencyLoader] - private void load(OsuColour colours) + private void load(OsuColour colours, AudioManager audio) { + activationSound = audio.Sample.Get(@"Menu/menuhit"); + colourNormal = colours.Yellow; colourHover = colours.YellowDark; @@ -281,6 +286,8 @@ namespace osu.Game.Screens.Play { Action?.Invoke(); + activationSound.Play(); + box.FlashColour(Color4.White, 500, EasingTypes.OutQuint); aspect.ScaleTo(1.2f, 2000, EasingTypes.OutQuint); return true; From 04f7acb68a2607fea989e030a891783c48d90efe Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 19 May 2017 22:46:51 +0900 Subject: [PATCH 06/11] Add setting checkbox to toggle debug logs --- .../Overlays/Settings/Sections/Debug/GeneralSettings.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs index 9fbb4011b7..c0ee478b37 100644 --- a/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs +++ b/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs @@ -12,7 +12,7 @@ namespace osu.Game.Overlays.Settings.Sections.Debug protected override string Header => "General"; [BackgroundDependencyLoader] - private void load(FrameworkDebugConfigManager config) + private void load(FrameworkDebugConfigManager config, FrameworkConfigManager frameworkConfig) { Children = new Drawable[] { @@ -20,6 +20,11 @@ namespace osu.Game.Overlays.Settings.Sections.Debug { LabelText = "Bypass caching", Bindable = config.GetBindable(FrameworkDebugConfig.BypassCaching) + }, + new SettingsCheckbox + { + LabelText = "Debug logs", + Bindable = frameworkConfig.GetBindable(FrameworkSetting.ShowLogOverlay) } }; } From 5bcef91b8912a66cceb06354c1d055a1074d9d78 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 19 May 2017 22:49:47 +0900 Subject: [PATCH 07/11] Add padding to setting value on on screen display Long audio device names were destroying all padding. --- osu.Game/Overlays/OnScreenDisplay.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/osu.Game/Overlays/OnScreenDisplay.cs b/osu.Game/Overlays/OnScreenDisplay.cs index fb1aed3657..4034d19c80 100644 --- a/osu.Game/Overlays/OnScreenDisplay.cs +++ b/osu.Game/Overlays/OnScreenDisplay.cs @@ -76,6 +76,7 @@ namespace osu.Game.Overlays { TextSize = 24, Font = @"Exo2.0-Light", + Padding = new MarginPadding { Left = 10, Right = 10 }, Anchor = Anchor.Centre, Origin = Anchor.BottomCentre, }, From 0332348b2484d60a3a7ea8218139994730dbbb77 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 19 May 2017 22:51:09 +0900 Subject: [PATCH 08/11] Correctly display default audio device on OSD --- osu.Game/Overlays/OnScreenDisplay.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/Overlays/OnScreenDisplay.cs b/osu.Game/Overlays/OnScreenDisplay.cs index 4034d19c80..d262826fd2 100644 --- a/osu.Game/Overlays/OnScreenDisplay.cs +++ b/osu.Game/Overlays/OnScreenDisplay.cs @@ -117,7 +117,7 @@ namespace osu.Game.Overlays private void load(FrameworkConfigManager frameworkConfig) { trackSetting(frameworkConfig.GetBindable(FrameworkSetting.FrameSync), v => display(v, "Frame Limiter", v.GetDescription(), "Ctrl+F7")); - trackSetting(frameworkConfig.GetBindable(FrameworkSetting.AudioDevice), v => display(v, "Audio Device", v, v)); + trackSetting(frameworkConfig.GetBindable(FrameworkSetting.AudioDevice), v => display(v, "Audio Device", string.IsNullOrEmpty(v) ? "Default" : v, v)); trackSetting(frameworkConfig.GetBindable(FrameworkSetting.ShowLogOverlay), v => display(v, "Debug Logs", v ? "visible" : "hidden", "Ctrl+F10")); Action displayResolution = delegate { display(null, "Screen Resolution", frameworkConfig.Get(FrameworkSetting.Width) + "x" + frameworkConfig.Get(FrameworkSetting.Height)); }; From 528d79be51f8e3605be711c884d5e90ddfecce27 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 19 May 2017 22:53:08 +0900 Subject: [PATCH 09/11] 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 10/11] 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 11/11] 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) } }; }