Merge remote-tracking branch 'origin/master' into timingchange-rework

# Conflicts:
#	osu-framework

osu-framework

@@ -1 +1 @@
-Subproject commit 9131d8a75d784c42649fc04ad16ee609fe81748f
+Subproject commit 83ee0bf59995a4399dd7c2ee676cdac6ac1669f8

osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs

@@ -70,7 +70,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             {
                 base.AccentColour = value;
 
-                glowContainer.EdgeEffect = new EdgeEffect
+                glowContainer.EdgeEffect = new EdgeEffectParameters
                 {
                     Type = EdgeEffectType.Glow,
                     Radius = 2f,

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

@@ -176,14 +176,14 @@ namespace osu.Game.Rulesets.Mania.UI
 
                 background.Colour = accentColour;
 
-                hitTargetBar.EdgeEffect = new EdgeEffect
+                hitTargetBar.EdgeEffect = new EdgeEffectParameters
                 {
                     Type = EdgeEffectType.Glow,
                     Radius = 5,
                     Colour = accentColour.Opacity(0.5f),
                 };
 
-                keyIcon.EdgeEffect = new EdgeEffect
+                keyIcon.EdgeEffect = new EdgeEffectParameters
                 {
                     Type = EdgeEffectType.Glow,
                     Radius = 5,

osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPoint.cs

@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
             Masking = true;
             AutoSizeAxes = Axes.Both;
             CornerRadius = width / 2;
-            EdgeEffect = new EdgeEffect
+            EdgeEffect = new EdgeEffectParameters
             {
                 Type = EdgeEffectType.Glow,
                 Colour = Color4.White.Opacity(0.2f),

osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/NumberPiece.cs

@@ -31,7 +31,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
                 {
                     Masking = true,
                     Origin = Anchor.Centre,
-                    EdgeEffect = new EdgeEffect
+                    EdgeEffect = new EdgeEffectParameters
                     {
                         Type = EdgeEffectType.Glow,
                         Radius = 60,

osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBackground.cs

@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             {
                 Disc.Colour = value;
 
-                EdgeEffect = new EdgeEffect
+                EdgeEffect = new EdgeEffectParameters
                 {
                     Hollow = true,
                     Type = EdgeEffectType.Glow,

osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerTicks.cs

@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
                 {
                     Colour = Color4.Black,
                     Alpha = 0.4f,
-                    EdgeEffect = new EdgeEffect
+                    EdgeEffect = new EdgeEffectParameters
                     {
                         Type = EdgeEffectType.Glow,
                         Radius = 10,

osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs

@@ -148,7 +148,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
 
         private void resetEdgeEffects()
         {
-            background.EdgeEffect = new EdgeEffect
+            background.EdgeEffect = new EdgeEffectParameters
             {
                 Type = EdgeEffectType.Glow,
                 Colour = AccentColour.Opacity(KiaiMode ? edge_alpha_kiai : 1f),

osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs

@@ -47,7 +47,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            EdgeEffect = new EdgeEffect
+            EdgeEffect = new EdgeEffectParameters
             {
                 Type = EdgeEffectType.Glow,
                 Colour = isRim ? colours.BlueDarker : colours.PinkDarker,

osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs

@@ -68,7 +68,7 @@ namespace osu.Game.Rulesets.Taiko.UI
                             RelativeSizeAxes = Axes.Both,
                             BorderThickness = 2,
                             Masking = true,
-                            EdgeEffect = new EdgeEffect
+                            EdgeEffect = new EdgeEffectParameters
                             {
                                 Type = EdgeEffectType.Shadow,
                                 Colour = Color4.Black.Opacity(0.2f),

osu.Game/Beatmaps/Drawables/Panel.cs

@@ -88,7 +88,7 @@ namespace osu.Game.Beatmaps.Drawables
         protected virtual void Selected()
         {
             nestedContainer.BorderThickness = 2.5f;
-            nestedContainer.EdgeEffect = new EdgeEffect
+            nestedContainer.EdgeEffect = new EdgeEffectParameters
             {
                 Type = EdgeEffectType.Glow,
                 Colour = new Color4(130, 204, 255, 150),
@@ -100,7 +100,7 @@ namespace osu.Game.Beatmaps.Drawables
         protected virtual void Deselected()
         {
             nestedContainer.BorderThickness = 0;
-            nestedContainer.EdgeEffect = new EdgeEffect
+            nestedContainer.EdgeEffect = new EdgeEffectParameters
             {
                 Type = EdgeEffectType.Shadow,
                 Offset = new Vector2(1),

osu.Game/Graphics/Backgrounds/Triangles.cs

@@ -7,7 +7,6 @@ using osu.Framework.MathUtils;
 using OpenTK;
 using OpenTK.Graphics;
 using System;
-using osu.Framework.Graphics.OpenGL;
 using osu.Framework.Graphics.Shaders;
 using osu.Framework.Graphics.Textures;
 using OpenTK.Graphics.ES30;
@@ -16,6 +15,7 @@ using osu.Framework.Graphics.Primitives;
 using osu.Framework.Allocation;
 using System.Collections.Generic;
 using osu.Framework.Graphics.Batches;
+using osu.Framework.Graphics.OpenGL.Vertices;
 using osu.Framework.Lists;
 
 namespace osu.Game.Graphics.Backgrounds

osu.Game/Graphics/Cursor/CursorTrail.cs

@@ -8,13 +8,13 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.Input;
 using OpenTK;
 using System;
-using osu.Framework.Graphics.OpenGL;
 using osu.Framework.Graphics.OpenGL.Buffers;
 using OpenTK.Graphics.ES30;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Timing;
 using System.Diagnostics;
+using osu.Framework.Graphics.OpenGL.Vertices;
 
 namespace osu.Game.Graphics.Cursor
 {

osu.Game/Graphics/Cursor/GameplayCursor.cs

@@ -67,7 +67,7 @@ namespace osu.Game.Graphics.Cursor
                         Masking = true,
                         BorderThickness = Size.X / 6,
                         BorderColour = Color4.White,
-                        EdgeEffect = new EdgeEffect
+                        EdgeEffect = new EdgeEffectParameters
                         {
                             Type = EdgeEffectType.Shadow,
                             Colour = Color4.Pink.Opacity(0.5f),

osu.Game/Graphics/Cursor/OsuCursorContainer.cs

@@ -1,129 +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 OpenTK;
-using OpenTK.Graphics;
-using osu.Framework.Allocation;
-using osu.Framework.Configuration;
-using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Cursor;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
-using osu.Framework.Input;
-using osu.Game.Configuration;
-using System;
-
-namespace osu.Game.Graphics.Cursor
-{
-    public class OsuCursorContainer : CursorContainer
-    {
-        protected override Drawable CreateCursor() => new OsuCursor();
-
-        public OsuCursorContainer()
-        {
-            Add(new CursorTrail { Depth = 1 });
-        }
-
-        protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
-        {
-            ActiveCursor.Scale = new Vector2(1);
-            ActiveCursor.ScaleTo(1.2f, 100, EasingTypes.OutQuad);
-            return base.OnMouseDown(state, args);
-        }
-
-        protected override bool OnMouseUp(InputState state, MouseUpEventArgs args)
-        {
-            if (!state.Mouse.HasMainButtonPressed)
-                ActiveCursor.ScaleTo(1, 200, EasingTypes.OutQuad);
-            return base.OnMouseUp(state, args);
-        }
-
-        public class OsuCursor : Container
-        {
-            private Container cursorContainer;
-            private Bindable<double> cursorScale;
-
-            public OsuCursor()
-            {
-                Origin = Anchor.Centre;
-                Size = new Vector2(42);
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(OsuConfigManager config)
-            {
-                cursorScale = config.GetBindable<double>(OsuConfig.CursorSize);
-
-                Children = new Drawable[]
-                {
-                    cursorContainer = new CircularContainer
-                    {
-                        Origin = Anchor.Centre,
-                        Anchor = Anchor.Centre,
-                        RelativeSizeAxes = Axes.Both,
-                        Scale = new Vector2((float)cursorScale),
-                        Masking = true,
-                        BorderThickness = Size.X / 6,
-                        BorderColour = Color4.White,
-                        EdgeEffect = new EdgeEffect {
-                            Type = EdgeEffectType.Shadow,
-                            Colour = Color4.Pink.Opacity(0.5f),
-                            Radius = 5,
-                        },
-                        Children = new Drawable[]
-                        {
-                            new Box
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Alpha = 0,
-                                AlwaysPresent = true,
-                            },
-                            new CircularContainer
-                            {
-                                Origin = Anchor.Centre,
-                                Anchor = Anchor.Centre,
-                                RelativeSizeAxes = Axes.Both,
-                                Masking = true,
-                                BorderThickness = Size.X / 3,
-                                BorderColour = Color4.White.Opacity(0.5f),
-                                Children = new Drawable[]
-                                {
-                                    new Box
-                                    {
-                                        RelativeSizeAxes = Axes.Both,
-                                        Alpha = 0,
-                                        AlwaysPresent = true,
-                                    },
-                                },
-                            },
-                            new CircularContainer
-                            {
-                                Origin = Anchor.Centre,
-                                Anchor = Anchor.Centre,
-                                RelativeSizeAxes = Axes.Both,
-                                Scale = new Vector2(0.1f),
-                                Masking = true,
-                                Children = new Drawable[]
-                                {
-                                    new Box
-                                    {
-                                        RelativeSizeAxes = Axes.Both,
-                                        Colour = Color4.White,
-                                    },
-                                },
-                            },
-                        }
-                    },
-                };
-                cursorScale.ValueChanged += scaleChanged;
-            }
-
-            private void scaleChanged(object sender, EventArgs e)
-            {
-                cursorContainer.Scale = new Vector2((float)cursorScale);
-            }
-        }
-    }
-}

osu.Game/Graphics/Cursor/OsuTooltipContainer.cs

@@ -52,7 +52,7 @@ namespace osu.Game.Graphics.Cursor
 
                 CornerRadius = 5;
                 Masking = true;
-                EdgeEffect = new EdgeEffect
+                EdgeEffect = new EdgeEffectParameters
                 {
                     Type = EdgeEffectType.Shadow,
                     Colour = Color4.Black.Opacity(40),

osu.Game/Graphics/UserInterface/DialogButton.cs

@@ -222,7 +222,7 @@ namespace osu.Game.Graphics.UserInterface
                             Width = 0.8f,
                             Masking = true,
                             MaskingSmoothness = 2,
-                            EdgeEffect = new EdgeEffect
+                            EdgeEffect = new EdgeEffectParameters
                             {
                                 Type = EdgeEffectType.Shadow,
                                 Colour = Color4.Black.Opacity(0.2f),

osu.Game/Graphics/UserInterface/IconButton.cs

@@ -50,7 +50,7 @@ namespace osu.Game.Graphics.UserInterface
 
                     CornerRadius = 5,
                     Masking = true,
-                    EdgeEffect = new EdgeEffect
+                    EdgeEffect = new EdgeEffectParameters
                     {
                         Colour = Color4.Black.Opacity(0.04f),
                         Type = EdgeEffectType.Shadow,

osu.Game/Graphics/UserInterface/Nub.cs

@@ -56,7 +56,7 @@ namespace osu.Game.Graphics.UserInterface
             GlowingAccentColour = colours.PinkLighter;
             GlowColour = colours.PinkDarker;
 
-            EdgeEffect = new EdgeEffect
+            EdgeEffect = new EdgeEffectParameters
             {
                 Colour = GlowColour,
                 Type = EdgeEffectType.Glow,

osu.Game/Graphics/UserInterface/TwoLayerButton.cs

@@ -79,18 +79,21 @@ namespace osu.Game.Graphics.UserInterface
                     Width = 0.4f,
                     Children = new Drawable[]
                     {
-                        new Container {
+                        new Container
+                        {
                             RelativeSizeAxes = Axes.Both,
                             Shear = new Vector2(shear, 0),
                             Masking = true,
                             MaskingSmoothness = 2,
-                            EdgeEffect = new EdgeEffect {
+                            EdgeEffect = new EdgeEffectParameters
+                            {
                                 Type = EdgeEffectType.Shadow,
                                 Colour = Color4.Black.Opacity(0.2f),
                                 Offset = new Vector2(2, 0),
                                 Radius = 2,
                             },
-                            Children = new[] {
+                            Children = new[]
+                            {
                                 IconLayer = new Box
                                 {
                                     RelativeSizeAxes = Axes.Both,
@@ -113,18 +116,21 @@ namespace osu.Game.Graphics.UserInterface
                     Width = 0.6f,
                     Children = new Drawable[]
                     {
-                        new Container {
+                        new Container
+                        {
                             RelativeSizeAxes = Axes.Both,
                             Shear = new Vector2(shear, 0),
                             Masking = true,
                             MaskingSmoothness = 2,
-                            EdgeEffect = new EdgeEffect {
+                            EdgeEffect = new EdgeEffectParameters
+                            {
                                 Type = EdgeEffectType.Shadow,
                                 Colour = Color4.Black.Opacity(0.2f),
                                 Offset = new Vector2(2, 0),
                                 Radius = 2,
                             },
-                            Children = new[] {
+                            Children = new[]
+                            {
                                 TextLayer = new Box
                                 {
                                     Origin = Anchor.TopLeft,

osu.Game/OsuGame.cs

@@ -77,8 +77,10 @@ namespace osu.Game
         public void ToggleDirect() => direct.ToggleVisibility();
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(FrameworkConfigManager frameworkConfig)
         {
+            this.frameworkConfig = frameworkConfig;
+
             if (!Host.IsPrimaryInstance)
             {
                 Logger.Log(@"osu! does not support multiple running instances.", LoggingTarget.Runtime, LogLevel.Error);
@@ -259,6 +261,19 @@ namespace osu.Game
             {
                 switch (args.Key)
                 {
+                    case Key.R:
+                        if (state.Keyboard.AltPressed)
+                        {
+                            var sensitivity = frameworkConfig.GetBindable<double>(FrameworkSetting.CursorSensitivity);
+
+                            sensitivity.Disabled = false;
+                            sensitivity.Value = 1;
+                            sensitivity.Disabled = true;
+
+                            frameworkConfig.Set(FrameworkSetting.ActiveInputHandlers, string.Empty);
+                            return true;
+                        }
+                        break;
                     case Key.T:
                         Toolbar.ToggleVisibility();
                         return true;
@@ -284,6 +299,7 @@ namespace osu.Game
         private Container overlayContent;
 
         private OsuScreen currentScreen;
+        private FrameworkConfigManager frameworkConfig;
 
         private void screenChanged(Screen newScreen)
         {

osu.Game/Overlays/Chat/ChatTabControl.cs

@@ -141,7 +141,7 @@ namespace osu.Game.Overlays.Chat
                 Shear = new Vector2(shear_width / ChatOverlay.TAB_AREA_HEIGHT, 0);
 
                 Masking = true;
-                EdgeEffect = new EdgeEffect
+                EdgeEffect = new EdgeEffectParameters
                 {
                     Type = EdgeEffectType.Shadow,
                     Radius = 10,

osu.Game/Overlays/Dialog/PopupDialog.cs

@@ -145,7 +145,7 @@ namespace osu.Game.Overlays.Dialog
                         {
                             RelativeSizeAxes = Axes.Both,
                             Masking = true,
-                            EdgeEffect = new EdgeEffect
+                            EdgeEffect = new EdgeEffectParameters
                             {
                                 Type = EdgeEffectType.Shadow,
                                 Colour = Color4.Black.Opacity(0.5f),

osu.Game/Overlays/Direct/DirectGridPanel.cs

@@ -30,7 +30,7 @@ namespace osu.Game.Overlays.Direct
             CornerRadius = 4;
             Masking = true;
 
-            EdgeEffect = new EdgeEffect
+            EdgeEffect = new EdgeEffectParameters
             {
                 Type = EdgeEffectType.Shadow,
                 Offset = new Vector2(0f, 1f),

osu.Game/Overlays/Direct/DirectListPanel.cs

@@ -31,7 +31,7 @@ namespace osu.Game.Overlays.Direct
             Height = height;
             CornerRadius = 5;
             Masking = true;
-            EdgeEffect = new EdgeEffect
+            EdgeEffect = new EdgeEffectParameters
             {
                 Type = EdgeEffectType.Shadow,
                 Offset = new Vector2(0f, 1f),

osu.Game/Overlays/Music/CollectionsDropdown.cs

@@ -39,7 +39,7 @@ namespace osu.Game.Overlays.Music
                 Icon.TextSize = 14;
                 Icon.Margin = new MarginPadding(0);
                 Foreground.Padding = new MarginPadding { Top = 4, Bottom = 4, Left = 10, Right = 10 };
-                EdgeEffect = new EdgeEffect
+                EdgeEffect = new EdgeEffectParameters
                 {
                     Type = EdgeEffectType.Shadow,
                     Colour = Color4.Black.Opacity(0.3f),
@@ -60,7 +60,7 @@ namespace osu.Game.Overlays.Music
             public CollectionsMenu()
             {
                 CornerRadius = 5;
-                EdgeEffect = new EdgeEffect
+                EdgeEffect = new EdgeEffectParameters
                 {
                     Type = EdgeEffectType.Shadow,
                     Colour = Color4.Black.Opacity(0.3f),

osu.Game/Overlays/Music/PlaylistOverlay.cs

@@ -52,7 +52,7 @@ namespace osu.Game.Overlays.Music
                     RelativeSizeAxes = Axes.Both,
                     CornerRadius = 5,
                     Masking = true,
-                    EdgeEffect = new EdgeEffect
+                    EdgeEffect = new EdgeEffectParameters
                     {
                         Type = EdgeEffectType.Shadow,
                         Colour = Color4.Black.Opacity(40),

osu.Game/Overlays/MusicController.cs

@@ -106,7 +106,7 @@ namespace osu.Game.Overlays
                             Height = player_height,
                             Masking = true,
                             CornerRadius = 5,
-                            EdgeEffect = new EdgeEffect
+                            EdgeEffect = new EdgeEffectParameters
                             {
                                 Type = EdgeEffectType.Shadow,
                                 Colour = Color4.Black.Opacity(40),

osu.Game/Overlays/Notifications/Notification.cs

@@ -238,7 +238,7 @@ namespace osu.Game.Overlays.Notifications
                 set
                 {
                     base.Colour = value;
-                    pulsateLayer.EdgeEffect = new EdgeEffect
+                    pulsateLayer.EdgeEffect = new EdgeEffectParameters
                     {
                         Colour = ((Color4)value).Opacity(0.5f), //todo: avoid cast
                         Type = EdgeEffectType.Glow,

osu.Game/Overlays/OnScreenDisplay.cs

@@ -125,6 +125,14 @@ namespace osu.Game.Overlays
             trackSetting(frameworkConfig.GetBindable<int>(FrameworkSetting.Width), v => displayResolution());
             trackSetting(frameworkConfig.GetBindable<int>(FrameworkSetting.Height), v => displayResolution());
 
+            trackSetting(frameworkConfig.GetBindable<double>(FrameworkSetting.CursorSensitivity), v => display(v, "Cursor Sensitivity", v.ToString(@"0.##x"), "Ctrl+Alt+R to reset"));
+            trackSetting(frameworkConfig.GetBindable<string>(FrameworkSetting.ActiveInputHandlers),
+                delegate (string v)
+                {
+                    bool raw = v.Contains("Raw");
+                    display(raw, "Raw Input", raw ? "enabled" : "disabled", "Ctrl+Alt+R to reset");
+                });
+
             trackSetting(frameworkConfig.GetBindable<WindowMode>(FrameworkSetting.WindowMode), v => display(v, "Screen Mode", v.ToString(), "Alt+Enter"));
         }
 
@@ -245,7 +253,7 @@ namespace osu.Game.Overlays
                 Masking = true;
                 CornerRadius = 3;
 
-                EdgeEffect = new EdgeEffect
+                EdgeEffect = new EdgeEffectParameters
                 {
                     Colour = colours.BlueDark.Opacity(glow_strength),
                     Type = EdgeEffectType.Glow,

osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs

@@ -290,7 +290,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
                     Margin = new MarginPadding { Bottom = 5 };
                     Masking = true;
                     CornerRadius = 5;
-                    EdgeEffect = new EdgeEffect
+                    EdgeEffect = new EdgeEffectParameters
                     {
                         Type = EdgeEffectType.Shadow,
                         Colour = Color4.Black.Opacity(0.25f),
@@ -326,7 +326,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
                     CornerRadius = 5;
                     ItemsContainer.Padding = new MarginPadding(0);
                     Masking = true;
-                    EdgeEffect = new EdgeEffect
+                    EdgeEffect = new EdgeEffectParameters
                     {
                         Type = EdgeEffectType.Shadow,
                         Colour = Color4.Black.Opacity(0.25f),

osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs

@@ -21,9 +21,6 @@ namespace osu.Game.Overlays.Settings.Sections.Input
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager osuConfig, FrameworkConfigManager config)
         {
-            activeInputHandlers = config.GetBindable<string>(FrameworkSetting.ActiveInputHandlers);
-            rawInputToggle.Value = activeInputHandlers.Value.Contains("Raw");
-
             Children = new Drawable[]
             {
                 new SettingsCheckbox
@@ -62,11 +59,17 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 activeInputHandlers.Value = enabled ?
                     activeInputHandlers.Value.Replace(standard_mouse_handler, raw_mouse_handler) :
                     activeInputHandlers.Value.Replace(raw_mouse_handler, standard_mouse_handler);
-
-                sensitivity.Bindable.Disabled = !enabled;
             };
 
-            rawInputToggle.TriggerChange();
+            activeInputHandlers = config.GetBindable<string>(FrameworkSetting.ActiveInputHandlers);
+            activeInputHandlers.ValueChanged += handlers =>
+            {
+                bool raw = handlers.Contains("Raw");
+                rawInputToggle.Value = raw;
+                sensitivity.Bindable.Disabled = !raw;
+            };
+
+            activeInputHandlers.TriggerChange();
         }
 
         private class SensitivitySetting : SettingsSlider<double, SensitivitySlider>

osu.Game/Overlays/Toolbar/ToolbarButton.cs

@@ -172,7 +172,7 @@ namespace osu.Game.Overlays.Toolbar
             RelativeSizeAxes = Axes.Both;
             Masking = true;
             MaskingSmoothness = 0;
-            EdgeEffect = new EdgeEffect
+            EdgeEffect = new EdgeEffectParameters
             {
                 Type = EdgeEffectType.Shadow,
                 Colour = Color4.Black.Opacity(40),

osu.Game/Overlays/Toolbar/ToolbarModeButton.cs

@@ -33,7 +33,7 @@ namespace osu.Game.Overlays.Toolbar
                 {
                     DrawableIcon.Colour = Color4.White;
                     DrawableIcon.Masking = true;
-                    DrawableIcon.EdgeEffect = new EdgeEffect
+                    DrawableIcon.EdgeEffect = new EdgeEffectParameters
                     {
                         Type = EdgeEffectType.Glow,
                         Colour = new Color4(255, 194, 224, 100),

osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs

@@ -46,7 +46,7 @@ namespace osu.Game.Overlays.Toolbar
                     Anchor = Anchor.BottomLeft,
                     Origin = Anchor.TopLeft,
                     Masking = true,
-                    EdgeEffect = new EdgeEffect
+                    EdgeEffect = new EdgeEffectParameters
                     {
                         Type = EdgeEffectType.Glow,
                         Colour = new Color4(255, 194, 224, 100),

osu.Game/Overlays/Toolbar/ToolbarUserButton.cs

@@ -31,7 +31,7 @@ namespace osu.Game.Overlays.Toolbar
                 Anchor = Anchor.CentreLeft,
                 Origin = Anchor.CentreLeft,
                 CornerRadius = 4,
-                EdgeEffect = new EdgeEffect
+                EdgeEffect = new EdgeEffectParameters
                 {
                     Type = EdgeEffectType.Shadow,
                     Radius = 4,

osu.Game/Overlays/WaveOverlayContainer.cs

@@ -173,7 +173,7 @@ namespace osu.Game.Overlays
                 RelativeSizeAxes = Axes.X;
                 Width = 1.5f;
                 Masking = true;
-                EdgeEffect = new EdgeEffect
+                EdgeEffect = new EdgeEffectParameters
                 {
                     Type = EdgeEffectType.Shadow,
                     Colour = Color4.Black.Opacity(50),

osu.Game/Rulesets/Timing/DrawableTimingSection.cs

@@ -29,9 +29,9 @@ namespace osu.Game.Rulesets.Timing
     /// </para>
     ///
     /// <para>
-    /// This container will always be relatively-sized and positioned to its parent through the use of <see cref="Drawable.RelativeSizeAxes"/>
+    /// This container is and must always be relatively-sized and positioned to its such that the parent can utilise
-    /// and <see cref="Drawable.RelativePositionAxes"/> such that the parent can utilise <see cref="Container{T}.RelativeChildSize"/> and
+    /// <see cref="Container{T}.RelativeChildSize"/> and <see cref="Container{T}.RelativeChildOffset"/> to apply further time offsets
-    /// <see cref="Container{T}.RelativeChildOffset"/> to apply further time offsets to this collection of hit objects.
+    /// to this collection of hit objects.
     /// </para>
     /// </summary>
     public abstract class DrawableTimingSection : Container<DrawableHitObject>
@@ -57,6 +57,8 @@ namespace osu.Game.Rulesets.Timing
         {
             this.autoSizingAxes = autoSizingAxes;
 
+            RelativePositionAxes = Axes.Both;
+
             // We need a default size since RelativeSizeAxes is overridden
             Size = Vector2.One;
         }
@@ -69,12 +71,6 @@ namespace osu.Game.Rulesets.Timing
             set { throw new InvalidOperationException($"{nameof(DrawableTimingSection)} must always be relatively-sized."); }
         }
 
-        public override Axes RelativePositionAxes
-        {
-            get { return Axes.Both; }
-            set { throw new InvalidOperationException($"{nameof(DrawableTimingSection)} must always be relatively-positioned."); }
-        }
-
         public override void InvalidateFromChild(Invalidation invalidation)
         {
             // We only want to re-compute our size when a child's size or position has changed

osu.Game/Screens/Menu/Button.cs

@@ -54,7 +54,7 @@ namespace osu.Game.Screens.Menu
                 {
                     Masking = true,
                     MaskingSmoothness = 2,
-                    EdgeEffect = new EdgeEffect
+                    EdgeEffect = new EdgeEffectParameters
                     {
                         Type = EdgeEffectType.Shadow,
                         Colour = Color4.Black.Opacity(0.2f),

osu.Game/Screens/Multiplayer/DrawableRoom.cs

@@ -47,7 +47,7 @@ namespace osu.Game.Screens.Multiplayer
             Height = height;
             CornerRadius = 5;
             Masking = true;
-            EdgeEffect = new EdgeEffect
+            EdgeEffect = new EdgeEffectParameters
             {
                 Type = EdgeEffectType.Shadow,
                 Colour = Color4.Black.Opacity(40),

osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs

@@ -57,7 +57,7 @@ namespace osu.Game.Screens.Play.HUD
                     return;
                 glowColour = value;
 
-                fill.EdgeEffect = new EdgeEffect
+                fill.EdgeEffect = new EdgeEffectParameters
                 {
                     Colour = glowColour.Opacity(base_glow_opacity),
                     Radius = 8,

osu.Game/Screens/Play/MenuOverlay.cs

@@ -164,7 +164,7 @@ namespace osu.Game.Screens.Play
                             AutoSizeAxes = Axes.Y,
                             Direction = FillDirection.Vertical,
                             Masking = true,
-                            EdgeEffect = new EdgeEffect
+                            EdgeEffect = new EdgeEffectParameters
                             {
                                 Type = EdgeEffectType.Shadow,
                                 Colour = Color4.Black.Opacity(0.6f),

osu.Game/Screens/Ranking/ResultModeButton.cs

@@ -60,7 +60,7 @@ namespace osu.Game.Screens.Ranking
             activeColour = colours.PinkDarker;
             inactiveColour = OsuColour.Gray(0.8f);
 
-            EdgeEffect = new EdgeEffect
+            EdgeEffect = new EdgeEffectParameters
             {
                 Colour = Color4.Black.Opacity(0.4f),
                 Type = EdgeEffectType.Shadow,

osu.Game/Screens/Ranking/Results.cs

@@ -134,7 +134,7 @@ namespace osu.Game.Screens.Ranking
                         circleOuter = new CircularContainer
                         {
                             Size = new Vector2(circle_outer_scale),
-                            EdgeEffect = new EdgeEffect
+                            EdgeEffect = new EdgeEffectParameters
                             {
                                 Colour = Color4.Black.Opacity(0.4f),
                                 Type = EdgeEffectType.Shadow,
@@ -225,7 +225,7 @@ namespace osu.Game.Screens.Ranking
                         circleInner = new CircularContainer
                         {
                             Size = new Vector2(0.6f),
-                            EdgeEffect = new EdgeEffect
+                            EdgeEffect = new EdgeEffectParameters
                             {
                                 Colour = Color4.Black.Opacity(0.4f),
                                 Type = EdgeEffectType.Shadow,

osu.Game/Screens/Ranking/ResultsPage.cs

@@ -50,7 +50,7 @@ namespace osu.Game.Screens.Ranking
                 },
                 new CircularContainer
                 {
-                    EdgeEffect = new EdgeEffect
+                    EdgeEffect = new EdgeEffectParameters
                     {
                         Colour = colours.GrayF.Opacity(0.8f),
                         Type = EdgeEffectType.Shadow,
@@ -74,7 +74,7 @@ namespace osu.Game.Screens.Ranking
                 },
                 content = new CircularContainer
                 {
-                    EdgeEffect = new EdgeEffect
+                    EdgeEffect = new EdgeEffectParameters
                     {
                         Colour = Color4.Black.Opacity(0.2f),
                         Type = EdgeEffectType.Shadow,

osu.Game/Screens/Select/BeatmapInfoWedge.cs

@@ -36,7 +36,7 @@ namespace osu.Game.Screens.Select
             Masking = true;
             BorderColour = new Color4(221, 255, 255, 255);
             BorderThickness = 2.5f;
-            EdgeEffect = new EdgeEffect
+            EdgeEffect = new EdgeEffectParameters
             {
                 Type = EdgeEffectType.Glow,
                 Colour = new Color4(130, 204, 255, 150),

osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs

@@ -147,7 +147,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                                         CornerRadius = corner_radius,
                                         Masking = true,
                                         OnLoadComplete = d => d.FadeInFromZero(200),
-                                        EdgeEffect = new EdgeEffect
+                                        EdgeEffect = new EdgeEffectParameters
                                         {
                                             Type = EdgeEffectType.Shadow,
                                             Radius = 1,

osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs

@@ -99,7 +99,7 @@ namespace osu.Game.Screens.Select.Options
                     RelativeSizeAxes = Axes.Both,
                     Shear = new Vector2(0.2f, 0f),
                     Masking = true,
-                    EdgeEffect = new EdgeEffect
+                    EdgeEffect = new EdgeEffectParameters
                     {
                         Type = EdgeEffectType.Shadow,
                         Colour = Color4.Black.Opacity(0.2f),

osu.Game/Users/UserPanel.cs

@@ -34,7 +34,7 @@ namespace osu.Game.Users
             Height = height - status_height;
             Masking = true;
             CornerRadius = 5;
-            EdgeEffect = new EdgeEffect
+            EdgeEffect = new EdgeEffectParameters
             {
                 Type = EdgeEffectType.Shadow,
                 Colour = Color4.Black.Opacity(0.25f),
@@ -68,7 +68,7 @@ namespace osu.Game.Users
                             User = user,
                             Masking = true,
                             CornerRadius = 5,
-                            EdgeEffect = new EdgeEffect
+                            EdgeEffect = new EdgeEffectParameters
                             {
                                 Type = EdgeEffectType.Shadow,
                                 Colour = Color4.Black.Opacity(0.25f),

osu.Game/osu.Game.csproj

@@ -43,7 +43,8 @@
       <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1341\lib\net45\OpenTK.dll</HintPath>
     </Reference>
     <Reference Include="SharpCompress, Version=0.15.2.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\sharpcompress.0.15.2\lib\net45\SharpCompress.dll</HintPath>
+      <HintPath Condition="Exists('$(SolutionDir)\packages\sharpcompress.0.15.2')" >$(SolutionDir)\packages\sharpcompress.0.15.2\lib\net45\SharpCompress.dll</HintPath>
+      <HintPath Condition="Exists('$(SolutionDir)\packages\SharpCompress.0.15.2')" >$(SolutionDir)\packages\SharpCompress.0.15.2\lib\net45\SharpCompress.dll</HintPath>
     </Reference>
     <Reference Include="SQLite.Net, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\SQLite.Net.Core-PCL.3.1.1\lib\portable-win8+net45+wp8+wpa81+MonoAndroid1+MonoTouch1\SQLite.Net.dll</HintPath>
@@ -508,4 +509,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>