h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-12 17:43:05 +08:00
Code Issues Releases Wiki Activity

Remove redundant code

Browse Source
This commit is contained in:
TocoToucan 2018-03-16 20:42:05 +03:00
parent 34dc8e7375
commit 604e725f3f
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Input/Bindings/GlobalActionContainer.cs
View File

@ -68,13 +68,14 @@ namespace osu.Game.Input.Bindings
DecreaseVolume, DecreaseVolume,
[Description("Toggle mute")] [Description("Toggle mute")]
ToggleMute, ToggleMute,
[Description("Take screenshot")]
TakeScreenshot,
// In-Game Keybindings // In-Game Keybindings
[Description("Skip Cutscene")] [Description("Skip Cutscene")]
SkipCutscene, SkipCutscene,
[Description("Quick Retry (Hold)")] [Description("Quick Retry (Hold)")]
QuickRetry, QuickRetry,
[Description("Take screenshot")]
TakeScreenshot
} }
} }

4
osu.Game/OsuGame.cs
View File

@ -81,8 +81,6 @@ namespace osu.Game
private Bindable<int> configRuleset; private Bindable<int> configRuleset;
public Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>(); public Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
private ScreenshotManager screenshotManager;
private Bindable<int> configSkin; private Bindable<int> configSkin;
private readonly string[] args; private readonly string[] args;
@ -220,7 +218,7 @@ namespace osu.Game
}, },
mainContent = new Container { RelativeSizeAxes = Axes.Both }, mainContent = new Container { RelativeSizeAxes = Axes.Both },
overlayContent = new Container { RelativeSizeAxes = Axes.Both, Depth = float.MinValue }, overlayContent = new Container { RelativeSizeAxes = Axes.Both, Depth = float.MinValue },
screenshotManager = new ScreenshotManager() new ScreenshotManager()
}); });
loadComponentSingleFile(screenStack = new Loader(), d => loadComponentSingleFile(screenStack = new Loader(), d =>

3
osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs
View File

@ -1,5 +1,6 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Game.Configuration; using osu.Game.Configuration;
@ -25,7 +26,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
LabelText = "Rotate cursor when dragging", LabelText = "Rotate cursor when dragging",
Bindable = config.GetBindable<bool>(OsuSetting.CursorRotation) Bindable = config.GetBindable<bool>(OsuSetting.CursorRotation)
}, },
new SettingsEnumDropdown<ScreenshotFormat>() new SettingsEnumDropdown<ScreenshotFormat>
{ {
LabelText = "Screenshot format", LabelText = "Screenshot format",
Bindable = config.GetBindable<ScreenshotFormat>(OsuSetting.ScreenshotFormat) Bindable = config.GetBindable<ScreenshotFormat>(OsuSetting.ScreenshotFormat)