Merge branch 'master' into add-hit-lighting

This commit is contained in:
Dan Balasescu
2019-09-19 18:07:29 +09:00
committed by GitHub
39 changed files with 333 additions and 251 deletions

View File

@ -31,11 +31,6 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
LabelText = "Hit Lighting",
Bindable = config.GetBindable<bool>(OsuSetting.HitLighting)
},
new SettingsCheckbox
{
LabelText = "Rotate cursor when dragging",
Bindable = config.GetBindable<bool>(OsuSetting.CursorRotation)
},
new SettingsEnumDropdown<ScreenshotFormat>
{
LabelText = "Screenshot format",

View File

@ -6,7 +6,7 @@ using osu.Game.Configuration;
namespace osu.Game.Overlays.Settings.Sections.Graphics
{
public class MainMenuSettings : SettingsSubsection
public class UserInterfaceSettings : SettingsSubsection
{
protected override string Header => "User Interface";
@ -15,6 +15,11 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
{
Children = new[]
{
new SettingsCheckbox
{
LabelText = "Rotate cursor when dragging",
Bindable = config.GetBindable<bool>(OsuSetting.CursorRotation)
},
new SettingsCheckbox
{
LabelText = "Parallax",