h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-23 05:47:19 +08:00
Code Issues Releases Wiki Activity

Revert "Add OSD + config value for scroll speed"

Browse Source 
This reverts commit a6d8b28221910993005d6adbbcc5b0447b5a1511.
This commit is contained in:
smoogipoo 2018-01-11 13:40:46 +09:00
parent e5f17e3ddb
commit 712d586d41
4 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
View File

@ -15,7 +15,6 @@ using osu.Framework.Configuration;
using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Mania.Objects.Drawables;
using osu.Framework.Graphics.Shapes;
using osu.Game.Configuration;
using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.UI.Scrolling;
@ -162,10 +161,8 @@ namespace osu.Game.Rulesets.Mania.UI
}
[BackgroundDependencyLoader]
private void load(OsuColour colours, OsuConfigManager config)
private void load(OsuColour colours)
{
config.BindWith(OsuSetting.UserScrollSpeed, VisibleTimeRange);
normalColumnColours = new List<Color4>
{
colours.RedDark,

4
osu.Game/Configuration/OsuConfigManager.cs
View File

@ -73,7 +73,6 @@ namespace osu.Game.Configuration
Set(OsuSetting.FloatingComments, false);
Set(OsuSetting.ScrollingAlgorithm, ScrollingAlgorithmType.Global);
Set(OsuSetting.UserScrollSpeed, 1500.0, 50.0, 10000.0);
// Update
Set(OsuSetting.ReleaseStream, ReleaseStream.Lazer);
@ -120,7 +119,6 @@ namespace osu.Game.Configuration
ChatDisplayHeight,
Version,
ShowConvertedBeatmaps,
ScrollingAlgorithm,
UserScrollSpeed
ScrollingAlgorithm
}
}

6
osu.Game/Overlays/OnScreenDisplay.cs
View File

@ -14,7 +14,6 @@ using osu.Game.Graphics;
using OpenTK;
using OpenTK.Graphics;
using osu.Framework.Extensions.Color4Extensions;
using osu.Game.Configuration;
using osu.Game.Graphics.Sprites;
namespace osu.Game.Overlays
@ -116,7 +115,7 @@ namespace osu.Game.Overlays
}
[BackgroundDependencyLoader]
private void load(FrameworkConfigManager frameworkConfig, OsuConfigManager osuConfig)
private void load(FrameworkConfigManager frameworkConfig)
{
trackSetting(frameworkConfig.GetBindable<FrameSync>(FrameworkSetting.FrameSync), v => display(v, "Frame Limiter", v.GetDescription(), "Ctrl+F7"));
trackSetting(frameworkConfig.GetBindable<string>(FrameworkSetting.AudioDevice), v => display(v, "Audio Device", string.IsNullOrEmpty(v) ? "Default" : v, v));
@ -136,9 +135,6 @@ namespace osu.Game.Overlays
});
trackSetting(frameworkConfig.GetBindable<WindowMode>(FrameworkSetting.WindowMode), v => display(v, "Screen Mode", v.ToString(), "Alt+Enter"));
// Todo: This should be part of the ruleset-specific OSD
trackSetting(osuConfig.GetBindable<double>(OsuSetting.UserScrollSpeed), v => display(v, "Scroll Speed", $"{v:N0}ms", "Ctrl+(+/-) to change"));
}
private readonly List<IBindable> references = new List<IBindable>();

7
osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
View File

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Graphics;
@ -103,15 +102,13 @@ namespace osu.Game.Rulesets.UI.Scrolling
if (state.Keyboard.ControlPressed)
{
var lastValue = Transforms.OfType<TransformVisibleTimeRange>().LastOrDefault()?.EndValue ?? VisibleTimeRange.Value;
switch (args.Key)
{
case Key.Minus:
transformVisibleTimeRangeTo(lastValue + time_span_step, 200, Easing.OutQuint);
transformVisibleTimeRangeTo(VisibleTimeRange + time_span_step, 200, Easing.OutQuint);
break;
case Key.Plus:
transformVisibleTimeRangeTo(lastValue - time_span_step, 200, Easing.OutQuint);
transformVisibleTimeRangeTo(VisibleTimeRange - time_span_step, 200, Easing.OutQuint);
break;
}
}