RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-03-19 17:44:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into key-counter-fixes

Browse Source
This commit is contained in:
Dean Herbert 2019-09-18 14:08:40 +09:00
commit b4a396885d
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleLongCombo.cs
View File

@ -29,7 +29,8 @@ namespace osu.Game.Rulesets.Osu.Tests
}; };
for (int i = 0; i < 512; i++) for (int i = 0; i < 512; i++)
beatmap.HitObjects.Add(new HitCircle { Position = new Vector2(256, 192), StartTime = i * 100 }); if (i % 32 < 20)
beatmap.HitObjects.Add(new HitCircle { Position = new Vector2(256, 192), StartTime = i * 100 });
return beatmap; return beatmap;
} }

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

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

7
osu.Game/Overlays/Settings/Sections/Graphics/MainMenuSettings.cs → osu.Game/Overlays/Settings/Sections/Graphics/UserInterfaceSettings.cs
View File

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

2
osu.Game/Overlays/Settings/Sections/GraphicsSection.cs
View File

@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Settings.Sections
new RendererSettings(), new RendererSettings(),
new LayoutSettings(), new LayoutSettings(),
new DetailSettings(), new DetailSettings(),
new MainMenuSettings(), new UserInterfaceSettings(),
}; };
} }
} }