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

Formatting and naming

Browse Source
This commit is contained in:
Dean Herbert 2019-01-04 15:34:32 +09:00
parent 4c3310ca80
commit c528a3896d
4 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,12 +112,11 @@ namespace osu.Game.Configuration
{ {
} }
public override TrackedSettings CreateTrackedSettings() => public override TrackedSettings CreateTrackedSettings() => new TrackedSettings
new TrackedSettings {
{ new TrackedSetting<bool>(OsuSetting.MouseDisableButtons, v => new SettingDescription(!v, "gameplay mouse buttons", v ? "disabled" : "enabled")),
new TrackedSetting<bool>(OsuSetting.MouseDisableButtons, v => new SettingDescription(!v, "gameplay mouse buttons", v ? "disabled" : "enabled")), new TrackedSetting<ScalingMode>(OsuSetting.Scaling, m => new SettingDescription(m, "scaling", m.GetDescription())),
new TrackedSetting<ScalingMode>(OsuSetting.Scaling, m => new SettingDescription(m, "scaling", m.GetDescription())), };
};
} }
public enum OsuSetting public enum OsuSetting

1
osu.Game/Configuration/ScalingMode.cs
View File

@ -7,7 +7,6 @@ namespace osu.Game.Configuration
{ {
public enum ScalingMode public enum ScalingMode
{ {
Off, Off,
Everything, Everything,
[Description("Excluding overlays")] [Description("Excluding overlays")]

0
osu.Game/Screens/Backgrounds/BackgroundScreenEmpty.cs → osu.Game/Screens/Backgrounds/BackgroundScreenBlack.cs
View File

11
osu.Game/Screens/Play/Player.cs
View File

@ -182,12 +182,11 @@ namespace osu.Game.Screens.Play
}, },
new ScalingContainer(ScalingMode.Gameplay) new ScalingContainer(ScalingMode.Gameplay)
{ {
Child = Child = new LocalSkinOverrideContainer(working.Skin)
new LocalSkinOverrideContainer(working.Skin) {
{ RelativeSizeAxes = Axes.Both,
RelativeSizeAxes = Axes.Both, Child = RulesetContainer
Child = RulesetContainer }
}
}, },
new BreakOverlay(beatmap.BeatmapInfo.LetterboxInBreaks, ScoreProcessor) new BreakOverlay(beatmap.BeatmapInfo.LetterboxInBreaks, ScoreProcessor)
{ {