h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 00:47:24 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into download-button-state

Browse Source
This commit is contained in:
Dean Herbert 2018-07-16 03:17:26 +09:00 committed by GitHub
commit 4829f4f09c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs
View File

@ -21,7 +21,7 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
{ {
LabelText = "Audio Offset", LabelText = "Audio Offset",
Bindable = config.GetBindable<double>(OsuSetting.AudioOffset), Bindable = config.GetBindable<double>(OsuSetting.AudioOffset),
KeyboardStep = 100f KeyboardStep = 1f
}, },
new SettingsButton new SettingsButton
{ {

8
osu.Game/Overlays/Settings/Sections/Audio/VolumeSettings.cs
View File

@ -17,10 +17,10 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
{ {
Children = new Drawable[] Children = new Drawable[]
{ {
new SettingsSlider<double> { LabelText = "Master", Bindable = audio.Volume, KeyboardStep = 0.1f }, new SettingsSlider<double> { LabelText = "Master", Bindable = audio.Volume, KeyboardStep = 0.01f },
new SettingsSlider<double> { LabelText = "Master (Window Inactive)", Bindable = config.GetBindable<double>(OsuSetting.VolumeInactive), KeyboardStep = 0.1f }, new SettingsSlider<double> { LabelText = "Master (Window Inactive)", Bindable = config.GetBindable<double>(OsuSetting.VolumeInactive), KeyboardStep = 0.01f },
new SettingsSlider<double> { LabelText = "Effect", Bindable = audio.VolumeSample, KeyboardStep = 0.1f }, new SettingsSlider<double> { LabelText = "Effect", Bindable = audio.VolumeSample, KeyboardStep = 0.01f },
new SettingsSlider<double> { LabelText = "Music", Bindable = audio.VolumeTrack, KeyboardStep = 0.1f }, new SettingsSlider<double> { LabelText = "Music", Bindable = audio.VolumeTrack, KeyboardStep = 0.01f },
}; };
} }
} }

4
osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
View File

@ -21,13 +21,13 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
{ {
LabelText = "Background dim", LabelText = "Background dim",
Bindable = config.GetBindable<double>(OsuSetting.DimLevel), Bindable = config.GetBindable<double>(OsuSetting.DimLevel),
KeyboardStep = 0.1f KeyboardStep = 0.01f
}, },
new SettingsSlider<double> new SettingsSlider<double>
{ {
LabelText = "Background blur", LabelText = "Background blur",
Bindable = config.GetBindable<double>(OsuSetting.BlurLevel), Bindable = config.GetBindable<double>(OsuSetting.BlurLevel),
KeyboardStep = 0.1f KeyboardStep = 0.01f
}, },
new SettingsCheckbox new SettingsCheckbox
{ {

4
osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs
View File

@ -31,13 +31,13 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
{ {
LabelText = "Display beatmaps from", LabelText = "Display beatmaps from",
Bindable = config.GetBindable<double>(OsuSetting.DisplayStarsMinimum), Bindable = config.GetBindable<double>(OsuSetting.DisplayStarsMinimum),
KeyboardStep = 1f KeyboardStep = 0.1f
}, },
new SettingsSlider<double, StarSlider> new SettingsSlider<double, StarSlider>
{ {
LabelText = "up to", LabelText = "up to",
Bindable = config.GetBindable<double>(OsuSetting.DisplayStarsMaximum), Bindable = config.GetBindable<double>(OsuSetting.DisplayStarsMaximum),
KeyboardStep = 1f KeyboardStep = 0.1f
}, },
new SettingsEnumDropdown<RandomSelectAlgorithm> new SettingsEnumDropdown<RandomSelectAlgorithm>
{ {

4
osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
View File

@ -50,13 +50,13 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
{ {
LabelText = "Horizontal position", LabelText = "Horizontal position",
Bindable = config.GetBindable<double>(FrameworkSetting.LetterboxPositionX), Bindable = config.GetBindable<double>(FrameworkSetting.LetterboxPositionX),
KeyboardStep = 0.1f KeyboardStep = 0.01f
}, },
new SettingsSlider<double> new SettingsSlider<double>
{ {
LabelText = "Vertical position", LabelText = "Vertical position",
Bindable = config.GetBindable<double>(FrameworkSetting.LetterboxPositionY), Bindable = config.GetBindable<double>(FrameworkSetting.LetterboxPositionY),
KeyboardStep = 0.1f KeyboardStep = 0.01f
}, },
} }
}, },

4
osu.Game/Overlays/Settings/Sections/SkinSection.cs
View File

@ -36,13 +36,13 @@ namespace osu.Game.Overlays.Settings.Sections
{ {
LabelText = "Menu cursor size", LabelText = "Menu cursor size",
Bindable = config.GetBindable<double>(OsuSetting.MenuCursorSize), Bindable = config.GetBindable<double>(OsuSetting.MenuCursorSize),
KeyboardStep = 0.1f KeyboardStep = 0.01f
}, },
new SettingsSlider<double, SizeSlider> new SettingsSlider<double, SizeSlider>
{ {
LabelText = "Gameplay cursor size", LabelText = "Gameplay cursor size",
Bindable = config.GetBindable<double>(OsuSetting.GameplayCursorSize), Bindable = config.GetBindable<double>(OsuSetting.GameplayCursorSize),
KeyboardStep = 0.1f KeyboardStep = 0.01f
}, },
new SettingsCheckbox new SettingsCheckbox
{ {

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

@ -169,7 +169,7 @@ namespace osu.Game.Screens.Play
OnPause = () => OnPause = () =>
{ {
pauseContainer.Retries = RestartCount; pauseContainer.Retries = RestartCount;
hudOverlay.KeyCounter.IsCounting = pauseContainer.IsPaused; hudOverlay.KeyCounter.IsCounting = !pauseContainer.IsPaused;
}, },
OnResume = () => hudOverlay.KeyCounter.IsCounting = true, OnResume = () => hudOverlay.KeyCounter.IsCounting = true,
Children = new[] Children = new[]