Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage

osu-framework

@@ -1 +1 @@
-Subproject commit 72525837cf68aa9967cfede6fbe95489ed3b05ec
+Subproject commit cebdfb1bbb260e5aaca0a01e06d7128b3d1faae4

osu.Desktop.VisualTests/Tests/TestCaseManiaPlayfield.cs

@@ -0,0 +1,70 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Framework.Input;
+using osu.Framework.Testing;
+using osu.Framework.Graphics;
+using osu.Game.Rulesets.Mania.UI;
+using System.Linq;
+using System;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseManiaPlayfield : TestCase
+    {
+        public override string Description => @"Mania playfield";
+
+        protected override double TimePerAction => 200;
+
+        public override void Reset()
+        {
+            base.Reset();
+
+            const int max_columns = 10;
+
+            Action<int, SpecialColumnPosition> createPlayfield = (cols, pos) =>
+            {
+                Clear();
+                Add(new ManiaPlayfield(cols)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    SpecialColumnPosition = pos
+                });
+            };
+
+            for (int i = 1; i <= max_columns; i++)
+            {
+                int tempI = i;
+
+                AddStep($"{i} column" + (i > 1 ? "s" : ""), () => createPlayfield(tempI, SpecialColumnPosition.Normal));
+
+                AddStep("Trigger keys down", () => ((ManiaPlayfield)Children.First()).Columns.Children.ForEach(triggerKeyDown));
+                AddStep("Trigger keys up", () => ((ManiaPlayfield)Children.First()).Columns.Children.ForEach(triggerKeyUp));
+
+                AddStep("Left special style", () => createPlayfield(tempI, SpecialColumnPosition.Left));
+                AddStep("Right special style", () => createPlayfield(tempI, SpecialColumnPosition.Right));
+            }
+
+            AddStep("Normal special style", () => createPlayfield(max_columns, SpecialColumnPosition.Normal));
+        }
+
+        private void triggerKeyDown(Column column)
+        {
+            column.TriggerKeyDown(new InputState(), new KeyDownEventArgs
+            {
+                Key = column.Key,
+                Repeat = false
+            });
+        }
+
+        private void triggerKeyUp(Column column)
+        {
+            column.TriggerKeyUp(new InputState(), new KeyUpEventArgs
+            {
+                Key = column.Key
+            });
+        }
+    }
+}

osu.Desktop.VisualTests/VisualTestGame.cs

@@ -29,7 +29,7 @@ namespace osu.Desktop.VisualTests
             host.DrawThread.InactiveHz = host.DrawThread.ActiveHz;
             host.InputThread.InactiveHz = host.InputThread.ActiveHz;
 
-            host.Window.CursorState = CursorState.Hidden;
+            host.Window.CursorState |= CursorState.Hidden;
         }
     }
 }

osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj

@@ -190,6 +190,7 @@
     <Compile Include="Tests\TestCaseDrawings.cs" />
     <Compile Include="Tests\TestCaseGamefield.cs" />
     <Compile Include="Tests\TestCaseGraph.cs" />
+    <Compile Include="Tests\TestCaseManiaPlayfield.cs" />
     <Compile Include="Tests\TestCaseMenuOverlays.cs" />
     <Compile Include="Tests\TestCaseMusicController.cs" />
     <Compile Include="Tests\TestCaseNotificationManager.cs" />

osu.Desktop/OsuGameDesktop.cs

@@ -43,7 +43,7 @@ namespace osu.Desktop
             var desktopWindow = host.Window as DesktopGameWindow;
             if (desktopWindow != null)
             {
-                desktopWindow.CursorState = CursorState.Hidden;
+                desktopWindow.CursorState |= CursorState.Hidden;
 
                 desktopWindow.Icon = Icon.ExtractAssociatedIcon(Assembly.GetExecutingAssembly().Location);
                 desktopWindow.Title = Name;

osu.Game.Rulesets.Mania/UI/Column.cs

@@ -0,0 +1,202 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+
+using OpenTK;
+using OpenTK.Graphics;
+using OpenTK.Input;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Input;
+using osu.Game.Graphics;
+
+namespace osu.Game.Rulesets.Mania.UI
+{
+    public class Column : Container, IHasAccentColour
+    {
+        private const float key_size = 50;
+
+        private const float key_icon_size = 10;
+        private const float key_icon_corner_radius = 3;
+        private const float key_icon_border_radius = 2;
+
+        private const float hit_target_height = 10;
+        private const float hit_target_bar_height = 2;
+
+        private const float column_width = 45;
+        private const float special_column_width = 70;
+
+        public Key Key;
+
+        private readonly Box background;
+        private readonly Container hitTargetBar;
+        private readonly Container keyIcon;
+
+        public Column()
+        {
+            RelativeSizeAxes = Axes.Y;
+            Width = column_width;
+
+            Children = new Drawable[]
+            {
+                background = new Box
+                {
+                    Name = "Foreground",
+                    RelativeSizeAxes = Axes.Both,
+                    Alpha = 0.2f
+                },
+                new FillFlowContainer
+                {
+                    Name = "Key + hit target",
+                    Anchor = Anchor.BottomCentre,
+                    Origin = Anchor.BottomCentre,
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Direction = FillDirection.Vertical,
+                    Children = new[]
+                    {
+                        new Container
+                        {
+                            Name = "Key",
+                            Anchor = Anchor.BottomCentre,
+                            Origin = Anchor.BottomCentre,
+                            RelativeSizeAxes = Axes.X,
+                            Height = key_size,
+                            Children = new Drawable[]
+                            {
+                                new Box
+                                {
+                                    Name = "Key gradient",
+                                    RelativeSizeAxes = Axes.Both,
+                                    ColourInfo = ColourInfo.GradientVertical(Color4.Black, Color4.Black.Opacity(0)),
+                                    Alpha = 0.5f
+                                },
+                                keyIcon = new Container
+                                {
+                                    Name = "Key icon",
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                    Size = new Vector2(key_icon_size),
+                                    Masking = true,
+                                    CornerRadius = key_icon_corner_radius,
+                                    BorderThickness = 2,
+                                    BorderColour = Color4.White, // Not true
+                                    Children = new[]
+                                    {
+                                        new Box
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                            Alpha = 0,
+                                            AlwaysPresent = true
+                                        }
+                                    }
+                                }
+                            }
+                        },
+                        new Container
+                        {
+                            Name = "Hit target",
+                            Anchor = Anchor.BottomCentre,
+                            Origin = Anchor.BottomCentre,
+                            RelativeSizeAxes = Axes.X,
+                            Height = hit_target_height,
+                            Children = new Drawable[]
+                            {
+                                new Box
+                                {
+                                    Name = "Background",
+                                    RelativeSizeAxes = Axes.Both,
+                                    Colour = Color4.Black
+                                },
+                                hitTargetBar = new Container
+                                {
+                                    Name = "Bar",
+                                    Anchor = Anchor.BottomCentre,
+                                    Origin = Anchor.BottomCentre,
+                                    RelativeSizeAxes = Axes.X,
+                                    Height = hit_target_bar_height,
+                                    Masking = true,
+                                    Children = new[]
+                                    {
+                                        new Box
+                                        {
+                                            RelativeSizeAxes = Axes.Both
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            };
+        }
+
+        private bool isSpecial;
+        public bool IsSpecial
+        {
+            get { return isSpecial; }
+            set
+            {
+                if (isSpecial == value)
+                    return;
+                isSpecial = value;
+
+                Width = isSpecial ? special_column_width : column_width;
+            }
+        }
+
+        private Color4 accentColour;
+        public Color4 AccentColour
+        {
+            get { return accentColour; }
+            set
+            {
+                if (accentColour == value)
+                    return;
+                accentColour = value;
+
+                background.Colour = accentColour;
+
+                hitTargetBar.EdgeEffect = new EdgeEffect
+                {
+                    Type = EdgeEffectType.Glow,
+                    Radius = 5,
+                    Colour = accentColour.Opacity(0.5f),
+                };
+
+                keyIcon.EdgeEffect = new EdgeEffect
+                {
+                    Type = EdgeEffectType.Glow,
+                    Radius = 5,
+                    Colour = accentColour.Opacity(0.5f),
+                };
+            }
+        }
+
+        protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
+        {
+            if (args.Key == Key && !args.Repeat)
+            {
+                background.FadeTo(background.Alpha + 0.2f, 50, EasingTypes.OutQuint);
+                keyIcon.ScaleTo(1.4f, 50, EasingTypes.OutQuint);
+            }
+
+            return false;
+        }
+
+        protected override bool OnKeyUp(InputState state, KeyUpEventArgs args)
+        {
+            if (args.Key == Key)
+            {
+                background.FadeTo(0.2f, 800, EasingTypes.OutQuart);
+                keyIcon.ScaleTo(1f, 400, EasingTypes.OutQuart);
+            }
+
+            return false;
+        }
+    }
+
+}

osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs

@@ -8,29 +8,153 @@ using osu.Game.Rulesets.UI;
 using OpenTK;
 using OpenTK.Graphics;
 using osu.Game.Rulesets.Mania.Judgements;
+using osu.Framework.Graphics.Containers;
+using System;
+using osu.Framework.Graphics.Primitives;
+using osu.Game.Graphics;
+using osu.Framework.Allocation;
+using OpenTK.Input;
+using System.Linq;
+using System.Collections.Generic;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
     public class ManiaPlayfield : Playfield<ManiaBaseHit, ManiaJudgement>
     {
-        public ManiaPlayfield(int columns)
+        /// <summary>
+        /// Default column keys, expanding outwards from the middle as more column are added.
+        /// E.g. 2 columns use FJ, 4 columns use DFJK, 6 use SDFJKL, etc...
+        /// </summary>
+        private static readonly Key[] default_keys = { Key.A, Key.S, Key.D, Key.F, Key.J, Key.K, Key.L, Key.Semicolon };
+
+        private SpecialColumnPosition specialColumnPosition;
+        /// <summary>
+        /// The style to use for the special column.
+        /// </summary>
+        public SpecialColumnPosition SpecialColumnPosition
         {
-            Size = new Vector2(0.8f, 1f);
+            get { return specialColumnPosition; }
-            Anchor = Anchor.BottomCentre;
+            set
-            Origin = Anchor.BottomCentre;
+            {
+                if (IsLoaded)
+                    throw new InvalidOperationException($"Setting {nameof(SpecialColumnPosition)} after the playfield is loaded requires re-creating the playfield.");
+                specialColumnPosition = value;
+            }
+        }
 
-            Add(new Box { RelativeSizeAxes = Axes.Both, Alpha = 0.5f });
+        public readonly FlowContainer<Column> Columns;
 
-            for (int i = 0; i < columns; i++)
+        private List<Color4> normalColumnColours = new List<Color4>();
-                Add(new Box
+        private Color4 specialColumnColour;
+
+        private readonly int columnCount;
+
+        public ManiaPlayfield(int columnCount)
+        {
+            this.columnCount = columnCount;
+
+            if (columnCount <= 0)
+                throw new ArgumentException("Can't have zero or fewer columns.");
+
+            Children = new Drawable[]
+            {
+                new Container
                 {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
                     RelativeSizeAxes = Axes.Y,
-                    Size = new Vector2(2, 1),
+                    AutoSizeAxes = Axes.X,
-                    RelativePositionAxes = Axes.Both,
+                    Children = new Drawable[]
-                    Position = new Vector2((float)i / columns, 0),
+                    {
-                    Alpha = 0.5f,
+                        new Box
-                    Colour = Color4.Black
+                        {
-                });
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = Color4.Black
+                        },
+                        Columns = new FillFlowContainer<Column>
+                        {
+                            RelativeSizeAxes = Axes.Y,
+                            AutoSizeAxes = Axes.X,
+                            Direction = FillDirection.Horizontal,
+                            Padding = new MarginPadding { Left = 1, Right = 1 },
+                            Spacing = new Vector2(1, 0)
+                        }
+                    }
+                }
+            };
+
+            for (int i = 0; i < columnCount; i++)
+                Columns.Add(new Column());
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            normalColumnColours = new List<Color4>
+            {
+                colours.RedDark,
+                colours.GreenDark
+            };
+
+            specialColumnColour = colours.BlueDark;
+
+            // Set the special column + colour + key
+            for (int i = 0; i < columnCount; i++)
+            {
+                Column column = Columns.Children.ElementAt(i);
+                column.IsSpecial = isSpecialColumn(i);
+
+                if (!column.IsSpecial)
+                    continue;
+
+                column.Key = Key.Space;
+                column.AccentColour = specialColumnColour;
+            }
+
+            var nonSpecialColumns = Columns.Children.Where(c => !c.IsSpecial).ToList();
+
+            // We'll set the colours of the non-special columns in a separate loop, because the non-special
+            // column colours are mirrored across their centre and special styles mess with this
+            for (int i = 0; i < Math.Ceiling(nonSpecialColumns.Count / 2f); i++)
+            {
+                Color4 colour = normalColumnColours[i % normalColumnColours.Count];
+                nonSpecialColumns[i].AccentColour = colour;
+                nonSpecialColumns[nonSpecialColumns.Count - 1 - i].AccentColour = colour;
+            }
+
+            // We'll set the keys for non-special columns in another separate loop because it's not mirrored like the above colours
+            // Todo: This needs to go when we get to bindings and use Button1, ..., ButtonN instead
+            for (int i = 0; i < nonSpecialColumns.Count; i++)
+            {
+                Column column = nonSpecialColumns[i];
+
+                int keyOffset = default_keys.Length / 2 - nonSpecialColumns.Count / 2 + i;
+                if (keyOffset >= 0 && keyOffset < default_keys.Length)
+                    column.Key = default_keys[keyOffset];
+                else
+                    // There is no default key defined for this column. Let's set this to Unknown for now
+                    // however note that this will be gone after bindings are in place
+                    column.Key = Key.Unknown;
+            }
+        }
+
+        /// <summary>
+        /// Whether the column index is a special column for this playfield.
+        /// </summary>
+        /// <param name="column">The 0-based column index.</param>
+        /// <returns>Whether the column is a special column.</returns>
+        private bool isSpecialColumn(int column)
+        {
+            switch (SpecialColumnPosition)
+            {
+                default:
+                case SpecialColumnPosition.Normal:
+                    return columnCount % 2 == 1 && column == columnCount / 2;
+                case SpecialColumnPosition.Left:
+                    return column == 0;
+                case SpecialColumnPosition.Right:
+                    return column == columnCount - 1;
+            }
         }
     }
-}
+}

osu.Game.Rulesets.Mania/UI/SpecialColumnPosition.cs

@@ -0,0 +1,21 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+namespace osu.Game.Rulesets.Mania.UI
+{
+    public enum SpecialColumnPosition
+    {
+        /// <summary>
+        /// The special column will lie in the center of the columns.
+        /// </summary>
+        Normal,
+        /// <summary>
+        /// The special column will lie to the left of the columns.
+        /// </summary>
+        Left,
+        /// <summary>
+        /// The special column will lie to the right of the columns.
+        /// </summary>
+        Right
+    }
+}

osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj

@@ -56,10 +56,12 @@
     <Compile Include="Objects\ManiaBaseHit.cs" />
     <Compile Include="Objects\Note.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="UI\Column.cs" />
     <Compile Include="UI\ManiaHitRenderer.cs" />
     <Compile Include="UI\ManiaPlayfield.cs" />
     <Compile Include="ManiaRuleset.cs" />
     <Compile Include="Mods\ManiaMod.cs" />
+    <Compile Include="UI\SpecialColumnPosition.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu-framework\osu.Framework\osu.Framework.csproj">

osu.Game/Configuration/ConfineMouseMode.cs

@@ -1,12 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-namespace osu.Game.Configuration
-{
-    public enum ConfineMouseMode
-    {
-        Never,
-        Fullscreen,
-        Always
-    }
-}

osu.Game/Configuration/OsuConfigManager.cs

@@ -1,7 +1,6 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
 using osu.Framework.Configuration;
 using osu.Framework.Platform;
 using osu.Game.Screens.Select;
@@ -12,172 +11,65 @@ namespace osu.Game.Configuration
     {
         protected override void InitialiseDefaults()
         {
-#pragma warning disable CS0612 // Type or member is obsolete
+            // UI/selection defaults
+
+            Set(OsuConfig.Ruleset, 0, 0, int.MaxValue);
+            Set(OsuConfig.BeatmapDetailTab, BeatmapDetailTab.Details);
+
+            Set(OsuConfig.DisplayStarsMinimum, 0.0, 0, 10);
+            Set(OsuConfig.DisplayStarsMaximum, 10.0, 0, 10);
+
+            // Online settings
 
             Set(OsuConfig.Username, string.Empty);
             Set(OsuConfig.Token, string.Empty);
 
-            Set(OsuConfig.Ruleset, 0, 0, int.MaxValue);
+            Set(OsuConfig.SavePassword, false).ValueChanged += val =>
+            {
+                if (val) Set(OsuConfig.SaveUsername, true);
+            };
+
+            Set(OsuConfig.SaveUsername, true).ValueChanged += val =>
+            {
+                if (!val) Set(OsuConfig.SavePassword, false);
+            };
+
+            // Audio
 
             Set(OsuConfig.AudioDevice, string.Empty);
-            Set(OsuConfig.SavePassword, false);
-            Set(OsuConfig.SaveUsername, true);
-
-            Set(OsuConfig.MenuCursorSize, 1.0, 0.5f, 2);
-            Set(OsuConfig.GameplayCursorSize, 1.0, 0.5f, 2);
-            Set(OsuConfig.DimLevel, 0.3, 0, 1);
-
-            Set(OsuConfig.MouseDisableButtons, false);
-            Set(OsuConfig.MouseDisableWheel, false);
-
-            Set(OsuConfig.SnakingInSliders, true);
-            Set(OsuConfig.SnakingOutSliders, true);
-
-            Set(OsuConfig.MenuParallax, true);
 
             Set(OsuConfig.MenuVoice, true);
             Set(OsuConfig.MenuMusic, true);
 
-            Set(OsuConfig.BeatmapDetailTab, BeatmapDetailTab.Details);
+            Set(OsuConfig.AudioOffset, 0, -500.0, 500.0);
+
+            // Input
+
+            Set(OsuConfig.MenuCursorSize, 1.0, 0.5f, 2);
+            Set(OsuConfig.GameplayCursorSize, 1.0, 0.5f, 2);
+
+            Set(OsuConfig.MouseDisableButtons, false);
+            Set(OsuConfig.MouseDisableWheel, false);
+
+            // Graphics
+
+            Set(OsuConfig.ShowFpsDisplay, false);
+
+            Set(OsuConfig.MenuParallax, true);
+
+            Set(OsuConfig.SnakingInSliders, true);
+            Set(OsuConfig.SnakingOutSliders, true);
+
+            // Gameplay
+
+            Set(OsuConfig.DimLevel, 0.3, 0, 1);
 
             Set(OsuConfig.ShowInterface, true);
             Set(OsuConfig.KeyOverlay, false);
 
-            //todo: implement all settings below this line (remove the Disabled set when doing so).
+            // Update
-            Set(OsuConfig.AudioOffset, 0, -500.0, 500.0);
 
-            Set(OsuConfig.MouseSpeed, 1.0).Disabled = true;
+            Set(OsuConfig.ReleaseStream, ReleaseStream.Lazer);
-            Set(OsuConfig.BeatmapDirectory, @"Songs").Disabled = true; // TODO: use thi.Disabled = trues
-            Set(OsuConfig.AllowPublicInvites, true).Disabled = true;
-            Set(OsuConfig.AutoChatHide, true).Disabled = true;
-            Set(OsuConfig.AutomaticDownload, true).Disabled = true;
-            Set(OsuConfig.AutomaticDownloadNoVideo, false).Disabled = true;
-            Set(OsuConfig.BlockNonFriendPM, false).Disabled = true;
-            Set(OsuConfig.Bloom, false).Disabled = true;
-            Set(OsuConfig.BloomSoftening, false).Disabled = true;
-            Set(OsuConfig.BossKeyFirstActivation, true).Disabled = true;
-            Set(OsuConfig.ChatAudibleHighlight, true).Disabled = true;
-            Set(OsuConfig.ChatChannels, string.Empty).Disabled = true;
-            Set(OsuConfig.ChatFilter, false).Disabled = true;
-            Set(OsuConfig.ChatHighlightName, true).Disabled = true;
-            Set(OsuConfig.ChatMessageNotification, true).Disabled = true;
-            Set(OsuConfig.ChatLastChannel, string.Empty).Disabled = true;
-            Set(OsuConfig.ChatRemoveForeign, false).Disabled = true;
-            //Set(OsuConfig.ChatSortMode, UserSortMode.Rank).Disabled = true;
-            Set(OsuConfig.ComboBurst, true).Disabled = true;
-            Set(OsuConfig.ComboFire, false).Disabled = true;
-            Set(OsuConfig.ComboFireHeight, 3).Disabled = true;
-            Set(OsuConfig.ConfirmExit, false).Disabled = true;
-            Set(OsuConfig.AutoSendNowPlaying, true).Disabled = true;
-            Set(OsuConfig.AutomaticCursorSizing, false).Disabled = true;
-            Set(OsuConfig.Display, 1).Disabled = true;
-            Set(OsuConfig.DisplayCityLocation, false).Disabled = true;
-            Set(OsuConfig.DistanceSpacingEnabled, true).Disabled = true;
-            Set(OsuConfig.EditorTip, 0).Disabled = true;
-            Set(OsuConfig.VideoEditor, true).Disabled = true;
-            Set(OsuConfig.EditorDefaultSkin, false).Disabled = true;
-            Set(OsuConfig.EditorSnakingSliders, true).Disabled = true;
-            Set(OsuConfig.EditorHitAnimations, false).Disabled = true;
-            Set(OsuConfig.EditorFollowPoints, true).Disabled = true;
-            Set(OsuConfig.EditorStacking, true).Disabled = true;
-            Set(OsuConfig.ForceSliderRendering, false).Disabled = true;
-            Set(OsuConfig.FpsCounter, false).Disabled = true;
-            Set(OsuConfig.FrameTimeDisplay, false).Disabled = true;
-            Set(OsuConfig.GuideTips, @"").Disabled = true;
-            Set(OsuConfig.CursorRipple, false).Disabled = true;
-            Set(OsuConfig.HighlightWords, string.Empty).Disabled = true;
-            Set(OsuConfig.HighResolution, false).Disabled = true;
-            Set(OsuConfig.HitLighting, true).Disabled = true;
-            Set(OsuConfig.IgnoreBarline, false).Disabled = true;
-            Set(OsuConfig.IgnoreBeatmapSamples, false).Disabled = true;
-            Set(OsuConfig.IgnoreBeatmapSkins, false).Disabled = true;
-            Set(OsuConfig.IgnoreList, string.Empty).Disabled = true;
-            Set(OsuConfig.AllowNowPlayingHighlights, false).Disabled = true;
-            Set(OsuConfig.LastVersion, string.Empty).Disabled = true;
-            Set(OsuConfig.LastVersionPermissionsFailed, string.Empty).Disabled = true;
-            Set(OsuConfig.LoadSubmittedThread, true).Disabled = true;
-            Set(OsuConfig.LobbyPlayMode, -1).Disabled = true;
-            Set(OsuConfig.ShowInterfaceDuringRelax, false).Disabled = true;
-            Set(OsuConfig.LobbyShowExistingOnly, false).Disabled = true;
-            Set(OsuConfig.LobbyShowFriendsOnly, false).Disabled = true;
-            Set(OsuConfig.LobbyShowFull, false).Disabled = true;
-            Set(OsuConfig.LobbyShowInProgress, true).Disabled = true;
-            Set(OsuConfig.LobbyShowPassworded, true).Disabled = true;
-            Set(OsuConfig.LogPrivateMessages, false).Disabled = true;
-            Set(OsuConfig.LowResolution, false).Disabled = true;
-            //Set(OsuConfig.ManiaSpeed, SpeedMania.SPEED_DEFAULT, SpeedMania.SPEED_MIN, SpeedMania.SPEED_MAX).Disabled = true;
-            Set(OsuConfig.UsePerBeatmapManiaSpeed, true).Disabled = true;
-            Set(OsuConfig.ManiaSpeedBPMScale, true).Disabled = true;
-            Set(OsuConfig.MenuTip, 0).Disabled = true;
-            Set(OsuConfig.MouseSpeed, 1, 0.4, 6).Disabled = true;
-            Set(OsuConfig.ScoreMeterScale, 1, 0.5, 2).Disabled = true;
-            //Set(OsuConfig.ScoreMeterScale, 1, 0.5, OsuGame.Tournament ? 10 : 2).Disabled = true;
-            Set(OsuConfig.DistanceSpacing, 0.8, 0.1, 6).Disabled = true;
-            Set(OsuConfig.EditorBeatDivisor, 1, 1, 16).Disabled = true;
-            Set(OsuConfig.EditorGridSize, 32, 4, 32).Disabled = true;
-            Set(OsuConfig.EditorGridSizeDesign, 32, 4, 32).Disabled = true;
-            Set(OsuConfig.CustomFrameLimit, 240, 240, 999).Disabled = true;
-            Set(OsuConfig.MsnIntegration, false).Disabled = true;
-            Set(OsuConfig.MyPcSucks, false).Disabled = true;
-            Set(OsuConfig.NotifyFriends, true).Disabled = true;
-            Set(OsuConfig.NotifySubmittedThread, true).Disabled = true;
-            Set(OsuConfig.PopupDuringGameplay, true).Disabled = true;
-            Set(OsuConfig.ProgressBarType, ProgressBarType.Pie).Disabled = true;
-            Set(OsuConfig.RankType, RankingType.Top).Disabled = true;
-            Set(OsuConfig.RefreshRate, 60).Disabled = true;
-            Set(OsuConfig.OverrideRefreshRate, Get<int>(OsuConfig.RefreshRate) != 60).Disabled = true;
-            //Set(OsuConfig.ScaleMode, ScaleMode.WidescreenConservative).Disabled = true;
-            Set(OsuConfig.ScoreboardVisible, true).Disabled = true;
-            Set(OsuConfig.ScoreMeter, ScoreMeterType.Error).Disabled = true;
-            //Set(OsuConfig.ScoreMeter, OsuGame.Tournament ? ScoreMeterType.Colour : ScoreMeterType.Error).Disabled = true;
-            Set(OsuConfig.ScreenshotId, 0).Disabled = true;
-            Set(OsuConfig.MenuSnow, false).Disabled = true;
-            Set(OsuConfig.MenuTriangles, true).Disabled = true;
-            Set(OsuConfig.SongSelectThumbnails, true).Disabled = true;
-            Set(OsuConfig.ScreenshotFormat, ScreenshotFormat.Jpg).Disabled = true;
-            Set(OsuConfig.ShowReplayComments, true).Disabled = true;
-            Set(OsuConfig.ShowSpectators, true).Disabled = true;
-            Set(OsuConfig.ShowStoryboard, true).Disabled = true;
-            //Set(OsuConfig.Skin, SkinManager.DEFAULT_SKIN).Disabled = true;
-            Set(OsuConfig.SkinSamples, true).Disabled = true;
-            Set(OsuConfig.SkipTablet, false).Disabled = true;
-            Set(OsuConfig.Tablet, false).Disabled = true;
-            Set(OsuConfig.UpdatePending, false).Disabled = true;
-            Set(OsuConfig.UseSkinCursor, false).Disabled = true;
-            Set(OsuConfig.UseTaikoSkin, false).Disabled = true;
-            Set(OsuConfig.Video, true).Disabled = true;
-            Set(OsuConfig.Wiimote, false).Disabled = true;
-            Set(OsuConfig.YahooIntegration, false).Disabled = true;
-            Set(OsuConfig.ForceFrameFlush, false).Disabled = true;
-            Set(OsuConfig.DetectPerformanceIssues, true).Disabled = true;
-            Set(OsuConfig.RawInput, false).Disabled = true;
-            Set(OsuConfig.AbsoluteToOsuWindow, Get<bool>(OsuConfig.RawInput)).Disabled = true;
-            Set(OsuConfig.ShowMenuTips, true).Disabled = true;
-            Set(OsuConfig.HiddenShowFirstApproach, true).Disabled = true;
-            Set(OsuConfig.ComboColourSliderBall, true).Disabled = true;
-            Set(OsuConfig.AlternativeChatFont, false).Disabled = true;
-            Set(OsuConfig.DisplayStarsMaximum, 10.0, 0.0, 10.0).Disabled = true;
-            Set(OsuConfig.DisplayStarsMinimum, 0.0, 0.0, 10.0).Disabled = true;
-            Set(OsuConfig.ReleaseStream, ReleaseStream.Lazer).Disabled = true;
-            Set(OsuConfig.UpdateFailCount, 0).Disabled = true;
-            //Set(OsuConfig.TreeSortMode, TreeGroupMode.Show_All).Disabled = true;
-            //Set(OsuConfig.TreeSortMode2, TreeSortMode.Title).Disabled = true;
-            Set(OsuConfig.PermanentSongInfo, false).Disabled = true;
-            Set(OsuConfig.Ticker, false).Disabled = true;
-            Set(OsuConfig.CompatibilityContext, false).Disabled = true;
-            Set(OsuConfig.CanForceOptimusCompatibility, true).Disabled = true;
-            Set(OsuConfig.ConfineMouse, Get<bool>(OsuConfig.ConfineMouseToFullscreen) ?
-                ConfineMouseMode.Fullscreen : ConfineMouseMode.Never).Disabled = true;
-
-            GetOriginalBindable<bool>(OsuConfig.SavePassword).ValueChanged += delegate
-            {
-                if (Get<bool>(OsuConfig.SavePassword)) Set(OsuConfig.SaveUsername, true);
-            };
-            GetOriginalBindable<bool>(OsuConfig.SaveUsername).ValueChanged += delegate
-            {
-                if (!Get<bool>(OsuConfig.SaveUsername)) Set(OsuConfig.SavePassword, false);
-            };
-#pragma warning restore CS0612 // Type or member is obsolete
         }
 
         public OsuConfigManager(Storage storage) : base(storage)
@@ -187,150 +79,29 @@ namespace osu.Game.Configuration
 
     public enum OsuConfig
     {
-        // New osu:
         Ruleset,
         Token,
-        // Imported from old osu:
-        BeatmapDirectory,
-        AllowPublicInvites,
-        AutoChatHide,
-        AutomaticDownload,
-        AutomaticDownloadNoVideo,
-        BlockNonFriendPM,
-        Bloom,
-        BloomSoftening,
-        BossKeyFirstActivation,
-        ChatAudibleHighlight,
-        ChatChannels,
-        ChatFilter,
-        ChatHighlightName,
-        ChatMessageNotification,
-        ChatLastChannel,
-        ChatRemoveForeign,
-        ChatSortMode,
-        ComboBurst,
-        ComboFire,
-        ComboFireHeight,
-        ConfirmExit,
-        AutoSendNowPlaying,
         MenuCursorSize,
         GameplayCursorSize,
-        AutomaticCursorSizing,
         DimLevel,
-        Display,
-        DisplayCityLocation,
-        DistanceSpacingEnabled,
-        EditorTip,
-        VideoEditor,
-        EditorDefaultSkin,
-        EditorSnakingSliders,
-        EditorHitAnimations,
-        EditorFollowPoints,
-        EditorStacking,
-        ForceSliderRendering,
-        FpsCounter,
-        FrameTimeDisplay,
-        GuideTips,
-        CursorRipple,
-        HighlightWords,
-        HighResolution,
-        HitLighting,
-        IgnoreBarline,
-        IgnoreBeatmapSamples,
-        IgnoreBeatmapSkins,
-        IgnoreList,
         KeyOverlay,
-        Language,
-        LastPlayMode,
-        AllowNowPlayingHighlights,
-        LastVersion,
-        LastVersionPermissionsFailed,
-        LoadSubmittedThread,
-        LobbyPlayMode,
         ShowInterface,
-        ShowInterfaceDuringRelax,
-        LobbyShowExistingOnly,
-        LobbyShowFriendsOnly,
-        LobbyShowFull,
-        LobbyShowInProgress,
-        LobbyShowPassworded,
-        LogPrivateMessages,
-        LowResolution,
-        ManiaSpeed,
-        UsePerBeatmapManiaSpeed,
-        ManiaSpeedBPMScale,
-        MenuTip,
         MouseDisableButtons,
         MouseDisableWheel,
-        MouseSpeed,
         AudioOffset,
-        ScoreMeterScale,
-        DistanceSpacing,
-        EditorBeatDivisor,
-        EditorGridSize,
-        EditorGridSizeDesign,
-        CustomFrameLimit,
-        MsnIntegration,
-        MyPcSucks,
-        NotifyFriends,
-        NotifySubmittedThread,
-        PopupDuringGameplay,
-        ProgressBarType,
-        RankType,
-        RefreshRate,
-        OverrideRefreshRate,
-        ScaleMode,
-        ScoreboardVisible,
-        ScoreMeter,
-        ScreenshotId,
-        MenuSnow,
-        MenuTriangles,
-        SongSelectThumbnails,
-        ScreenshotFormat,
-        ShowReplayComments,
-        ShowSpectators,
-        ShowStoryboard,
-        Skin,
-        SkinSamples,
-        SkipTablet,
-        SnakingInSliders,
-        SnakingOutSliders,
-        Tablet,
-        UpdatePending,
-        UserFilter,
-        UseSkinCursor,
-        UseTaikoSkin,
-        Video,
-        Wiimote,
-        YahooIntegration,
-        ForceFrameFlush,
-        DetectPerformanceIssues,
         MenuMusic,
         MenuVoice,
         MenuParallax,
         BeatmapDetailTab,
-        RawInput,
-        AbsoluteToOsuWindow,
-        ConfineMouse,
-        [Obsolete]
-        ConfineMouseToFullscreen,
-        ShowMenuTips,
-        HiddenShowFirstApproach,
-        ComboColourSliderBall,
-        AlternativeChatFont,
         Username,
-        DisplayStarsMaximum,
-        DisplayStarsMinimum,
         AudioDevice,
         ReleaseStream,
-        UpdateFailCount,
         SavePassword,
         SaveUsername,
-        TreeSortMode,
+        DisplayStarsMinimum,
-        TreeSortMode2,
+        DisplayStarsMaximum,
-        PermanentSongInfo,
+        SnakingInSliders,
-        Ticker,
+        SnakingOutSliders,
-        CompatibilityContext,
+        ShowFpsDisplay
-        CanForceOptimusCompatibility,
     }
 }

osu.Game/Configuration/ProgressBarType.cs

@@ -1,18 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using System.ComponentModel;
-
-namespace osu.Game.Configuration
-{
-    public enum ProgressBarType
-    {
-        Off,
-        Pie,
-        [Description("Top Right")]
-        TopRight,
-        [Description("Bottom Right")]
-        BottomRight,
-        Bottom
-    }
-}

osu.Game/OsuGameBase.cs

@@ -19,6 +19,7 @@ using osu.Game.Graphics.Cursor;
 using osu.Game.Graphics.Processing;
 using osu.Game.Online.API;
 using SQLite.Net;
+using osu.Framework.Graphics.Performance;
 
 namespace osu.Game
 {
@@ -44,6 +45,8 @@ namespace osu.Game
 
         public readonly Bindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
 
+        private Bindable<bool> fpsDisplayVisible;
+
         protected AssemblyName AssemblyName => Assembly.GetEntryAssembly()?.GetName() ?? new AssemblyName { Version = new Version() };
 
         public bool IsDeployedBuild => AssemblyName.Version.Major > 0;
@@ -160,6 +163,15 @@ namespace osu.Game
                     },
                 }
             });
+
+            // TODO: This is temporary until we reimplement the local FPS display.
+            // It's just to allow end-users to access the framework FPS display without knowing the shortcut key.
+            fpsDisplayVisible = LocalConfig.GetBindable<bool>(OsuConfig.ShowFpsDisplay);
+            fpsDisplayVisible.ValueChanged += val =>
+            {
+                FrameStatisticsMode = val ? FrameStatisticsMode.Minimal : FrameStatisticsMode.None;
+            };
+            fpsDisplayVisible.TriggerChange();
         }
 
         public override void SetHost(GameHost host)

osu.Game/Overlays/Options/OptionDropdown.cs

@@ -24,6 +24,7 @@ namespace osu.Game.Overlays.Options
             set
             {
                 text.Text = value;
+                text.Alpha = !string.IsNullOrEmpty(value) ? 1 : 0;
             }
         }
 

osu.Game/Overlays/Options/OptionSlider.cs

@@ -12,11 +12,14 @@ using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Options
 {
-    public class OptionSlider<T> : OptionSlider<T, OsuSliderBar<T>> where T: struct
+    public class OptionSlider<T> : OptionSlider<T, OsuSliderBar<T>>
+        where T : struct
     {
     }
 
-    public class OptionSlider<T, U> : FillFlowContainer where T : struct where U : SliderBar<T>, new()
+    public class OptionSlider<T, U> : FillFlowContainer
+        where T : struct
+        where U : SliderBar<T>, new()
     {
         private readonly SliderBar<T> slider;
         private readonly SpriteText text;

osu.Game/Overlays/Options/Sections/Audio/MainMenuOptions.cs

@@ -2,33 +2,31 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Allocation;
-using osu.Framework.Graphics;
 using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
 
-namespace osu.Game.Overlays.Options.Sections.Input
+namespace osu.Game.Overlays.Options.Sections.Audio
 {
-    public class OtherInputOptions : OptionsSubsection
+    public class MainMenuOptions : OptionsSubsection
     {
-        protected override string Header => "Other";
+        protected override string Header => "Main Menu";
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
-            Children = new Drawable[]
+            Children = new[]
             {
                 new OsuCheckbox
                 {
-                    LabelText = "OS TabletPC support",
+                    LabelText = "Interface voices",
-                    Bindable = config.GetBindable<bool>(OsuConfig.Tablet)
+                    Bindable = config.GetBindable<bool>(OsuConfig.MenuVoice)
                 },
                 new OsuCheckbox
                 {
-                    LabelText = "Wiimote/TaTaCon Drum Support",
+                    LabelText = "osu! music theme",
-                    Bindable = config.GetBindable<bool>(OsuConfig.Wiimote)
+                    Bindable = config.GetBindable<bool>(OsuConfig.MenuMusic)
                 },
             };
         }
     }
-}
+}
-

osu.Game/Overlays/Options/Sections/Audio/VolumeOptions.cs

@@ -4,8 +4,6 @@
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Graphics;
-using osu.Game.Configuration;
-using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Options.Sections.Audio
 {
@@ -14,18 +12,13 @@ namespace osu.Game.Overlays.Options.Sections.Audio
         protected override string Header => "Volume";
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config, AudioManager audio)
+        private void load(AudioManager audio)
         {
             Children = new Drawable[]
             {
                 new OptionSlider<double> { LabelText = "Master", Bindable = audio.Volume },
                 new OptionSlider<double> { LabelText = "Effect", Bindable = audio.VolumeSample },
                 new OptionSlider<double> { LabelText = "Music", Bindable = audio.VolumeTrack },
-                new OsuCheckbox
-                {
-                    LabelText = "Ignore beatmap hitsounds",
-                    Bindable = config.GetBindable<bool>(OsuConfig.IgnoreBeatmapSamples)
-                }
             };
         }
     }

osu.Game/Overlays/Options/Sections/AudioSection.cs

@@ -1,7 +1,6 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
 using osu.Game.Overlays.Options.Sections.Audio;
@@ -17,9 +16,10 @@ namespace osu.Game.Overlays.Options.Sections
         {
             Children = new Drawable[]
             {
-                new AudioDevicesOptions { Alpha = RuntimeInfo.IsWindows ? 1 : 0 },
+                new AudioDevicesOptions(),
                 new VolumeOptions(),
                 new OffsetOptions(),
+                new MainMenuOptions(),
             };
         }
     }

osu.Game/Overlays/Options/Sections/EditorSection.cs

@@ -1,58 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Game.Configuration;
-using osu.Game.Graphics;
-using osu.Game.Graphics.UserInterface;
-using OpenTK;
-
-namespace osu.Game.Overlays.Options.Sections
-{
-    public class EditorSection : OptionsSection
-    {
-        public override string Header => "Editor";
-        public override FontAwesome Icon => FontAwesome.fa_pencil;
-
-        [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
-        {
-            FlowContent.Spacing = new Vector2(0, 5);
-            Children = new Drawable[]
-            {
-                new OsuCheckbox
-                {
-                    LabelText = "Background video",
-                    Bindable = config.GetBindable<bool>(OsuConfig.VideoEditor)
-                },
-                new OsuCheckbox
-                {
-                    LabelText = "Always use default skin",
-                    Bindable = config.GetBindable<bool>(OsuConfig.EditorDefaultSkin)
-                },
-                new OsuCheckbox
-                {
-                    LabelText = "Snaking sliders",
-                    Bindable = config.GetBindable<bool>(OsuConfig.EditorSnakingSliders)
-                },
-                new OsuCheckbox
-                {
-                    LabelText = "Hit animations",
-                    Bindable = config.GetBindable<bool>(OsuConfig.EditorHitAnimations)
-                },
-                new OsuCheckbox
-                {
-                    LabelText = "Follow points",
-                    Bindable = config.GetBindable<bool>(OsuConfig.EditorFollowPoints)
-                },
-                new OsuCheckbox
-                {
-                    LabelText = "Stacking",
-                    Bindable = config.GetBindable<bool>(OsuConfig.EditorStacking)
-                },
-            };
-        }
-    }
-}
-

osu.Game/Overlays/Options/Sections/Gameplay/GeneralOptions.cs

@@ -22,21 +22,6 @@ namespace osu.Game.Overlays.Options.Sections.Gameplay
                     LabelText = "Background dim",
                     Bindable = config.GetBindable<double>(OsuConfig.DimLevel)
                 },
-                new OptionEnumDropdown<ProgressBarType>
-                {
-                    LabelText = "Progress display",
-                    Bindable = config.GetBindable<ProgressBarType>(OsuConfig.ProgressBarType)
-                },
-                new OptionEnumDropdown<ScoreMeterType>
-                {
-                    LabelText = "Score meter type",
-                    Bindable = config.GetBindable<ScoreMeterType>(OsuConfig.ScoreMeter)
-                },
-                new OptionSlider<double>
-                {
-                    LabelText = "Score meter size",
-                    Bindable = config.GetBindable<double>(OsuConfig.ScoreMeterScale)
-                },
                 new OsuCheckbox
                 {
                     LabelText = "Show score overlay",
@@ -47,21 +32,6 @@ namespace osu.Game.Overlays.Options.Sections.Gameplay
                     LabelText = "Always show key overlay",
                     Bindable = config.GetBindable<bool>(OsuConfig.KeyOverlay)
                 },
-                new OsuCheckbox
-                {
-                    LabelText = "Show approach circle on first \"Hidden\" object",
-                    Bindable = config.GetBindable<bool>(OsuConfig.HiddenShowFirstApproach)
-                },
-                new OsuCheckbox
-                {
-                    LabelText = "Scale osu!mania scroll speed with BPM",
-                    Bindable = config.GetBindable<bool>(OsuConfig.ManiaSpeedBPMScale)
-                },
-                new OsuCheckbox
-                {
-                    LabelText = "Remember osu!mania scroll speed per beatmap",
-                    Bindable = config.GetBindable<bool>(OsuConfig.UsePerBeatmapManiaSpeed)
-                },
             };
         }
     }

osu.Game/Overlays/Options/Sections/General/LanguageOptions.cs

@@ -4,7 +4,6 @@
 using osu.Framework.Allocation;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
-using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Options.Sections.General
@@ -14,21 +13,15 @@ namespace osu.Game.Overlays.Options.Sections.General
         protected override string Header => "Language";
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager osuConfig, FrameworkConfigManager frameworkConfig)
+        private void load(FrameworkConfigManager frameworkConfig)
         {
             Children = new Drawable[]
             {
-                new OptionLabel { Text = "TODO: Dropdown" },
                 new OsuCheckbox
                 {
                     LabelText = "Prefer metadata in original language",
                     Bindable = frameworkConfig.GetBindable<bool>(FrameworkConfig.ShowUnicode)
                 },
-                new OsuCheckbox
-                {
-                    LabelText = "Use alternative font for chat display",
-                    Bindable = osuConfig.GetBindable<bool>(OsuConfig.AlternativeChatFont)
-                },
             };
         }
     }

osu.Game/Overlays/Options/Sections/General/UpdateOptions.cs

@@ -23,7 +23,6 @@ namespace osu.Game.Overlays.Options.Sections.General
                     LabelText = "Release stream",
                     Bindable = config.GetBindable<ReleaseStream>(OsuConfig.ReleaseStream),
                 },
-                new OptionLabel { Text = "Your osu! is up to date" }, // TODO: map this to reality
                 new OsuButton
                 {
                     RelativeSizeAxes = Axes.X,

osu.Game/Overlays/Options/Sections/Graphics/DetailOptions.cs

@@ -27,41 +27,6 @@ namespace osu.Game.Overlays.Options.Sections.Graphics
                     LabelText = "Snaking out sliders",
                     Bindable = config.GetBindable<bool>(OsuConfig.SnakingOutSliders)
                 },
-                new OsuCheckbox
-                {
-                    LabelText = "Background video",
-                    Bindable = config.GetBindable<bool>(OsuConfig.Video)
-                },
-                new OsuCheckbox
-                {
-                    LabelText = "Storyboards",
-                    Bindable = config.GetBindable<bool>(OsuConfig.ShowStoryboard)
-                },
-                new OsuCheckbox
-                {
-                    LabelText = "Combo bursts",
-                    Bindable = config.GetBindable<bool>(OsuConfig.ComboBurst)
-                },
-                new OsuCheckbox
-                {
-                    LabelText = "Hit lighting",
-                    Bindable = config.GetBindable<bool>(OsuConfig.HitLighting)
-                },
-                new OsuCheckbox
-                {
-                    LabelText = "Shaders",
-                    Bindable = config.GetBindable<bool>(OsuConfig.Bloom)
-                },
-                new OsuCheckbox
-                {
-                    LabelText = "Softening filter",
-                    Bindable = config.GetBindable<bool>(OsuConfig.BloomSoftening)
-                },
-                new OptionEnumDropdown<ScreenshotFormat>
-                {
-                    LabelText = "Screenshot",
-                    Bindable = config.GetBindable<ScreenshotFormat>(OsuConfig.ScreenshotFormat)
-                }
             };
         }
     }

osu.Game/Overlays/Options/Sections/Graphics/LayoutOptions.cs

@@ -24,7 +24,6 @@ namespace osu.Game.Overlays.Options.Sections.Graphics
 
             Children = new Drawable[]
             {
-                new OptionLabel { Text = "Resolution: TODO dropdown" },
                 new OptionEnumDropdown<WindowMode>
                 {
                     LabelText = "Screen mode",

osu.Game/Overlays/Options/Sections/Graphics/MainMenuOptions.cs

@@ -9,38 +9,18 @@ namespace osu.Game.Overlays.Options.Sections.Graphics
 {
     public class MainMenuOptions : OptionsSubsection
     {
-        protected override string Header => "Main Menu";
+        protected override string Header => "User Interface";
 
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
             Children = new[]
             {
-                new OsuCheckbox
-                {
-                    LabelText = "Snow",
-                    Bindable = config.GetBindable<bool>(OsuConfig.MenuSnow)
-                },
                 new OsuCheckbox
                 {
                     LabelText = "Parallax",
                     Bindable = config.GetBindable<bool>(OsuConfig.MenuParallax)
                 },
-                new OsuCheckbox
-                {
-                    LabelText = "Menu tips",
-                    Bindable = config.GetBindable<bool>(OsuConfig.ShowMenuTips)
-                },
-                new OsuCheckbox
-                {
-                    LabelText = "Interface voices",
-                    Bindable = config.GetBindable<bool>(OsuConfig.MenuVoice)
-                },
-                new OsuCheckbox
-                {
-                    LabelText = "osu! music theme",
-                    Bindable = config.GetBindable<bool>(OsuConfig.MenuMusic)
-                },
             };
         }
     }

osu.Game/Overlays/Options/Sections/Graphics/RendererOptions.cs

@@ -14,7 +14,7 @@ namespace osu.Game.Overlays.Options.Sections.Graphics
         protected override string Header => "Renderer";
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager osuConfig, FrameworkConfigManager config)
+        private void load(FrameworkConfigManager config, OsuConfigManager osuConfig)
         {
             // NOTE: Compatability mode omitted
             Children = new Drawable[]
@@ -27,18 +27,8 @@ namespace osu.Game.Overlays.Options.Sections.Graphics
                 },
                 new OsuCheckbox
                 {
-                    LabelText = "Show FPS counter",
+                    LabelText = "Show FPS",
-                    Bindable = osuConfig.GetBindable<bool>(OsuConfig.FpsCounter),
+                    Bindable = osuConfig.GetBindable<bool>(OsuConfig.ShowFpsDisplay)
-                },
-                new OsuCheckbox
-                {
-                    LabelText = "Reduce dropped frames",
-                    Bindable = osuConfig.GetBindable<bool>(OsuConfig.ForceFrameFlush),
-                },
-                new OsuCheckbox
-                {
-                    LabelText = "Detect performance issues",
-                    Bindable = osuConfig.GetBindable<bool>(OsuConfig.DetectPerformanceIssues),
                 },
             };
         }

osu.Game/Overlays/Options/Sections/Graphics/SongSelectGraphicsOptions.cs

@@ -1,27 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Framework.Allocation;
-using osu.Game.Configuration;
-using osu.Game.Graphics.UserInterface;
-
-namespace osu.Game.Overlays.Options.Sections.Graphics
-{
-    public class SongSelectGraphicsOptions : OptionsSubsection
-    {
-        protected override string Header => "Song Select";
-
-        [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
-        {
-            Children = new[]
-            {
-                new OsuCheckbox
-                {
-                    LabelText = "Show thumbnails",
-                    Bindable = config.GetBindable<bool>(OsuConfig.SongSelectThumbnails)
-                }
-            };
-        }
-    }
-}

osu.Game/Overlays/Options/Sections/GraphicsSection.cs

@@ -20,7 +20,6 @@ namespace osu.Game.Overlays.Options.Sections
                 new LayoutOptions(),
                 new DetailOptions(),
                 new MainMenuOptions(),
-                new SongSelectGraphicsOptions(),
             };
         }
     }

osu.Game/Overlays/Options/Sections/Input/KeyboardOptions.cs

@@ -17,13 +17,8 @@ namespace osu.Game.Overlays.Options.Sections.Input
                 new OsuButton
                 {
                     RelativeSizeAxes = Axes.X,
-                    Text = "Change keyboard bindings"
+                    Text = "Key Configuration"
                 },
-                new OsuButton
-                {
-                    RelativeSizeAxes = Axes.X,
-                    Text = "osu!mania layout"
-                }
             };
         }
     }

osu.Game/Overlays/Options/Sections/Input/MouseOptions.cs

@@ -2,7 +2,9 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Allocation;
+using osu.Framework.Configuration;
 using osu.Framework.Graphics;
+using osu.Framework.Input;
 using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterface;
 
@@ -13,44 +15,24 @@ namespace osu.Game.Overlays.Options.Sections.Input
         protected override string Header => "Mouse";
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
+        private void load(OsuConfigManager osuConfig, FrameworkConfigManager config)
         {
             Children = new Drawable[]
             {
-                new OptionSlider<double, SensitivitySlider>
-                {
-                    LabelText = "Sensitivity",
-                    Bindable = config.GetBindable<double>(OsuConfig.MouseSpeed)
-                },
-                new OsuCheckbox
-                {
-                    LabelText = "Raw input",
-                    Bindable = config.GetBindable<bool>(OsuConfig.RawInput)
-                },
-                new OsuCheckbox
-                {
-                    LabelText = "Map absolute raw input to the osu! window",
-                    Bindable = config.GetBindable<bool>(OsuConfig.AbsoluteToOsuWindow)
-                },
                 new OptionEnumDropdown<ConfineMouseMode>
                 {
                     LabelText = "Confine mouse cursor",
-                    Bindable = config.GetBindable<ConfineMouseMode>(OsuConfig.ConfineMouse),
+                    Bindable = config.GetBindable<ConfineMouseMode>(FrameworkConfig.ConfineMouseMode),
                 },
                 new OsuCheckbox
                 {
-                    LabelText = "Disable mouse wheel in play mode",
+                    LabelText = "Disable mouse wheel during gameplay",
-                    Bindable = config.GetBindable<bool>(OsuConfig.MouseDisableWheel)
+                    Bindable = osuConfig.GetBindable<bool>(OsuConfig.MouseDisableWheel)
                 },
                 new OsuCheckbox
                 {
-                    LabelText = "Disable mouse buttons in play mode",
+                    LabelText = "Disable mouse buttons during gameplay",
-                    Bindable = config.GetBindable<bool>(OsuConfig.MouseDisableButtons)
+                    Bindable = osuConfig.GetBindable<bool>(OsuConfig.MouseDisableButtons)
-                },
-                new OsuCheckbox
-                {
-                    LabelText = "Cursor ripples",
-                    Bindable = config.GetBindable<bool>(OsuConfig.CursorRipple)
                 },
             };
         }

osu.Game/Overlays/Options/Sections/InputSection.cs

@@ -18,7 +18,6 @@ namespace osu.Game.Overlays.Options.Sections
             {
                 new MouseOptions(),
                 new KeyboardOptions(),
-                new OtherInputOptions(),
             };
         }
     }

osu.Game/Overlays/Options/Sections/MaintenanceSection.cs

@@ -3,7 +3,6 @@
 
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
-using osu.Game.Graphics.UserInterface;
 using OpenTK;
 
 namespace osu.Game.Overlays.Options.Sections
@@ -18,27 +17,7 @@ namespace osu.Game.Overlays.Options.Sections
             FlowContent.Spacing = new Vector2(0, 5);
             Children = new Drawable[]
             {
-                new OsuButton
-                {
-                    RelativeSizeAxes = Axes.X,
-                    Text = "Delete all unranked maps",
-                },
-                new OsuButton
-                {
-                    RelativeSizeAxes = Axes.X,
-                    Text = "Repair folder permissions",
-                },
-                new OsuButton
-                {
-                    RelativeSizeAxes = Axes.X,
-                    Text = "Mark all maps as played",
-                },
-                new OsuButton
-                {
-                    RelativeSizeAxes = Axes.X,
-                    Text = "Run osu! updater",
-                },
             };
         }
     }
-}
+}

osu.Game/Overlays/Options/Sections/Online/InGameChatOptions.cs

@@ -1,53 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Game.Configuration;
-using osu.Game.Graphics.UserInterface;
-
-namespace osu.Game.Overlays.Options.Sections.Online
-{
-    public class InGameChatOptions : OptionsSubsection
-    {
-        protected override string Header => "Chat";
-
-        [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
-        {
-            Children = new Drawable[]
-            {
-                new OsuCheckbox
-                {
-                    LabelText = "Filter offensive words",
-                    Bindable = config.GetBindable<bool>(OsuConfig.ChatFilter)
-                },
-                new OsuCheckbox
-                {
-                    LabelText = "Filter foreign characters",
-                    Bindable = config.GetBindable<bool>(OsuConfig.ChatRemoveForeign)
-                },
-                new OsuCheckbox
-                {
-                    LabelText = "Log private messages",
-                    Bindable = config.GetBindable<bool>(OsuConfig.LogPrivateMessages)
-                },
-                new OsuCheckbox
-                {
-                    LabelText = "Block private messages from non-friends",
-                    Bindable = config.GetBindable<bool>(OsuConfig.BlockNonFriendPM)
-                },
-                new OptionLabel { Text = "Chat ignore list (space-seperated list)" },
-                new OptionTextBox {
-                    RelativeSizeAxes = Axes.X,
-                    Bindable = config.GetBindable<string>(OsuConfig.IgnoreList)
-                },
-                new OptionLabel { Text = "Chat highlight words (space-seperated list)" },
-                new OptionTextBox {
-                    RelativeSizeAxes = Axes.X,
-                    Bindable = config.GetBindable<string>(OsuConfig.HighlightWords)
-                },
-            };
-        }
-    }
-}

osu.Game/Overlays/Options/Sections/Online/IntegrationOptions.cs

@@ -1,43 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Game.Configuration;
-using osu.Game.Graphics.UserInterface;
-
-namespace osu.Game.Overlays.Options.Sections.Online
-{
-    public class IntegrationOptions : OptionsSubsection
-    {
-        protected override string Header => "Integration";
-
-        [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
-        {
-            Children = new Drawable[]
-            {
-                new OsuCheckbox
-                {
-                    LabelText = "Integrate with Yahoo! status display",
-                    Bindable = config.GetBindable<bool>(OsuConfig.YahooIntegration)
-                },
-                new OsuCheckbox
-                {
-                    LabelText = "Integrate with MSN Live status display",
-                    Bindable = config.GetBindable<bool>(OsuConfig.MsnIntegration)
-                },
-                new OsuCheckbox
-                {
-                    LabelText = "Automatically start osu!direct downloads",
-                    Bindable = config.GetBindable<bool>(OsuConfig.AutomaticDownload)
-                },
-                new OsuCheckbox
-                {
-                    LabelText = "Prefer no-video downloads",
-                    Bindable = config.GetBindable<bool>(OsuConfig.AutomaticDownloadNoVideo)
-                },
-            };
-        }
-    }
-}

osu.Game/Overlays/Options/Sections/Online/NotificationsOptions.cs

@@ -1,53 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Game.Configuration;
-using osu.Game.Graphics.UserInterface;
-
-namespace osu.Game.Overlays.Options.Sections.Online
-{
-    public class NotificationsOptions : OptionsSubsection
-    {
-        protected override string Header => "Notifications";
-
-        [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
-        {
-            Children = new Drawable[]
-            {
-                new OsuCheckbox
-                {
-                    LabelText = "Enable chat ticker",
-                    Bindable = config.GetBindable<bool>(OsuConfig.Ticker)
-                },
-                new OsuCheckbox
-                {
-                    LabelText = "Show a notification popup when someone says your name",
-                    Bindable = config.GetBindable<bool>(OsuConfig.ChatHighlightName)
-                },
-                new OsuCheckbox
-                {
-                    LabelText = "Show chat message notifications",
-                    Bindable = config.GetBindable<bool>(OsuConfig.ChatMessageNotification)
-                },
-                new OsuCheckbox
-                {
-                    LabelText = "Play a sound when someone says your name",
-                    Bindable = config.GetBindable<bool>(OsuConfig.ChatAudibleHighlight)
-                },
-                new OsuCheckbox
-                {
-                    LabelText = "Show notification popups instantly during gameplay",
-                    Bindable = config.GetBindable<bool>(OsuConfig.PopupDuringGameplay)
-                },
-                new OsuCheckbox
-                {
-                    LabelText = "Show notification popups when friends change status",
-                    Bindable = config.GetBindable<bool>(OsuConfig.NotifyFriends)
-                },
-            };
-        }
-    }
-}

osu.Game/Overlays/Options/Sections/Online/PrivacyOptions.cs

@@ -1,33 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Game.Configuration;
-using osu.Game.Graphics.UserInterface;
-
-namespace osu.Game.Overlays.Options.Sections.Online
-{
-    public class PrivacyOptions : OptionsSubsection
-    {
-        protected override string Header => "Privacy";
-
-        [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
-        {
-            Children = new Drawable[]
-            {
-                new OsuCheckbox
-                {
-                    LabelText = "Share your city location with others",
-                    Bindable = config.GetBindable<bool>(OsuConfig.DisplayCityLocation)
-                },
-                new OsuCheckbox
-                {
-                    LabelText = "Allow multiplayer game invites from all users",
-                    Bindable = config.GetBindable<bool>(OsuConfig.AllowPublicInvites)
-                },
-            };
-        }
-    }
-}

osu.Game/Overlays/Options/Sections/OnlineSection.cs

@@ -3,7 +3,6 @@
 
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
-using osu.Game.Overlays.Options.Sections.Online;
 
 namespace osu.Game.Overlays.Options.Sections
 {
@@ -16,10 +15,6 @@ namespace osu.Game.Overlays.Options.Sections
         {
             Children = new Drawable[]
             {
-                new InGameChatOptions(),
-                new PrivacyOptions(),
-                new NotificationsOptions(),
-                new IntegrationOptions(),
             };
         }
     }

osu.Game/Overlays/Options/Sections/SkinSection.cs

@@ -21,43 +21,6 @@ namespace osu.Game.Overlays.Options.Sections
             FlowContent.Spacing = new Vector2(0, 5);
             Children = new Drawable[]
             {
-                new OptionLabel { Text = "TODO: Skin preview textures" },
-                new OptionLabel { Text = "Current skin: TODO dropdown" },
-                new OsuButton
-                {
-                    RelativeSizeAxes = Axes.X,
-                    Text = "Preview gameplay",
-                },
-                new OsuButton
-                {
-                    RelativeSizeAxes = Axes.X,
-                    Text = "Open skin folder",
-                },
-                new OsuButton
-                {
-                    RelativeSizeAxes = Axes.X,
-                    Text = "Export as .osk",
-                },
-                new OsuCheckbox
-                {
-                    LabelText = "Ignore all beatmap skins",
-                    Bindable = config.GetBindable<bool>(OsuConfig.IgnoreBeatmapSkins)
-                },
-                new OsuCheckbox
-                {
-                    LabelText = "Use skin's sound samples",
-                    Bindable = config.GetBindable<bool>(OsuConfig.SkinSamples)
-                },
-                new OsuCheckbox
-                {
-                    LabelText = "Use Taiko skin for Taiko mode",
-                    Bindable = config.GetBindable<bool>(OsuConfig.UseTaikoSkin)
-                },
-                new OsuCheckbox
-                {
-                    LabelText = "Always use skin cursor",
-                    Bindable = config.GetBindable<bool>(OsuConfig.UseSkinCursor)
-                },
                 new OptionSlider<double, SizeSlider>
                 {
                     LabelText = "Menu cursor size",
@@ -68,11 +31,6 @@ namespace osu.Game.Overlays.Options.Sections
                     LabelText = "Gameplay cursor size",
                     Bindable = config.GetBindable<double>(OsuConfig.GameplayCursorSize)
                 },
-                new OsuCheckbox
-                {
-                    LabelText = "Automatic cursor size",
-                    Bindable = config.GetBindable<bool>(OsuConfig.AutomaticCursorSizing)
-                },
             };
         }
 

osu.Game/Overlays/OptionsOverlay.cs

@@ -51,7 +51,6 @@ namespace osu.Game.Overlays
                 new AudioSection(),
                 new SkinSection(),
                 new InputSection(),
-                new EditorSection(),
                 new OnlineSection(),
                 new MaintenanceSection(),
                 new DebugSection(),

osu.Game/Rulesets/UI/HitRenderer.cs

@@ -202,8 +202,6 @@ namespace osu.Game.Rulesets.UI
         protected HitRenderer(WorkingBeatmap beatmap)
             : base(beatmap)
         {
-            KeyConversionInputManager.Add(Playfield = CreatePlayfield());
-
             InputManager.Add(content = new Container
             {
                 RelativeSizeAxes = Axes.Both,
@@ -216,6 +214,8 @@ namespace osu.Game.Rulesets.UI
         [BackgroundDependencyLoader]
         private void load()
         {
+            KeyConversionInputManager.Add(Playfield = CreatePlayfield());
+
             loadObjects();
 
             if (InputManager?.ReplayInputHandler != null)

osu.Game/Screens/Select/PlaySongSelect.cs

@@ -69,6 +69,13 @@ namespace osu.Game.Screens.Select
             base.OnResuming(last);
         }
 
+        protected override void OnSuspending(Screen next)
+        {
+            modSelect.Hide();
+
+            base.OnSuspending(next);
+        }
+
         protected override bool OnExiting(Screen next)
         {
             if (modSelect.State == Visibility.Visible)

osu.Game/osu.Game.csproj

@@ -78,6 +78,7 @@
     <Compile Include="Overlays\Music\FilterControl.cs" />
     <Compile Include="Overlays\Music\PlaylistItem.cs" />
     <Compile Include="Overlays\Music\PlaylistList.cs" />
+    <Compile Include="Overlays\Options\Sections\Audio\MainMenuOptions.cs" />
     <Compile Include="Overlays\Toolbar\ToolbarChatButton.cs" />
     <Compile Include="Rulesets\Beatmaps\BeatmapConverter.cs" />
     <Compile Include="Rulesets\Beatmaps\BeatmapProcessor.cs" />
@@ -357,7 +358,6 @@
     <Compile Include="Overlays\Options\Sections\Graphics\LayoutOptions.cs" />
     <Compile Include="Overlays\Options\Sections\Graphics\DetailOptions.cs" />
     <Compile Include="Overlays\Options\Sections\Graphics\MainMenuOptions.cs" />
-    <Compile Include="Overlays\Options\Sections\Graphics\SongSelectGraphicsOptions.cs" />
     <Compile Include="Overlays\Options\Sections\GameplaySection.cs" />
     <Compile Include="Overlays\Options\Sections\Gameplay\GeneralOptions.cs" />
     <Compile Include="Overlays\Options\Sections\Gameplay\SongSelectOptions.cs" />
@@ -368,25 +368,17 @@
     <Compile Include="Overlays\Options\Sections\InputSection.cs" />
     <Compile Include="Overlays\Options\Sections\Input\MouseOptions.cs" />
     <Compile Include="Overlays\Options\Sections\Input\KeyboardOptions.cs" />
-    <Compile Include="Overlays\Options\Sections\Input\OtherInputOptions.cs" />
     <Compile Include="Overlays\Options\Sections\OnlineSection.cs" />
-    <Compile Include="Overlays\Options\Sections\Online\IntegrationOptions.cs" />
-    <Compile Include="Overlays\Options\Sections\Online\InGameChatOptions.cs" />
-    <Compile Include="Overlays\Options\Sections\EditorSection.cs" />
     <Compile Include="Overlays\Options\Sections\SkinSection.cs" />
-    <Compile Include="Overlays\Options\Sections\Online\PrivacyOptions.cs" />
-    <Compile Include="Overlays\Options\Sections\Online\NotificationsOptions.cs" />
     <Compile Include="Graphics\UserInterface\OsuCheckbox.cs" />
     <Compile Include="Overlays\Options\SidebarButton.cs" />
     <Compile Include="Overlays\Options\OptionTextBox.cs" />
     <Compile Include="Overlays\Options\OptionSlider.cs" />
-    <Compile Include="Configuration\ProgressBarType.cs" />
     <Compile Include="Overlays\Options\OptionEnumDropdown.cs" />
     <Compile Include="Configuration\RankingType.cs" />
     <Compile Include="Configuration\ScoreMeterType.cs" />
     <Compile Include="Configuration\ReleaseStream.cs" />
     <Compile Include="Configuration\ScreenshotFormat.cs" />
-    <Compile Include="Configuration\ConfineMouseMode.cs" />
     <Compile Include="Graphics\OsuColour.cs" />
     <Compile Include="Screens\Select\FilterControl.cs" />
     <Compile Include="Screens\Select\SearchTextBox.cs" />