Merge branch 'master' into nodal-hit-sounds

2025-02-21 00:53:31 +08:00 · 2017-04-22 22:11:19 +09:00 · 2017-04-22 22:11:19 +09:00 · 6fb8676215
commit 6fb8676215
parent 2af9bf1423 dbee95e859
40 changed files with 924 additions and 666 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit e24091cf7f5bf25602306c11146326079f2a98b0
+Subproject commit b4e1b9a0eb1782ab8cfc48e305fd295a25c0579e
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/ElongatedCirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/ElongatedCirclePiece.cs
@ -3,14 +3,13 @@

 using System;
 using osu.Framework.Graphics.Primitives;
-using osu.Game.Rulesets.Taiko.UI;

 namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
 {
    public class ElongatedCirclePiece : CirclePiece
    {
        /// <summary>
-        /// As we are being used to define the absolute size of hits, we need to be given a relative reference of our containing <see cref="TaikoPlayfield"/>.
+        /// As we are being used to define the absolute size of hits, we need to be given a relative reference of our containing playfield container.
        /// </summary>
        public Func<float> PlayfieldLengthReference;

@ -38,4 +37,4 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
            Width = (PlayfieldLengthReference?.Invoke() ?? 0) * Length + DrawHeight;
        }
    }
-}
+}
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@ -8,6 +8,7 @@ using osu.Game.Database;
 using osu.Game.Rulesets.Mods;
 using System;
 using System.Collections.Generic;
+using System.Linq;

 namespace osu.Game.Beatmaps
 {
@ -26,6 +27,18 @@ namespace osu.Game.Beatmaps
            BeatmapInfo = beatmapInfo;
            BeatmapSetInfo = beatmapSetInfo;
            WithStoryboard = withStoryboard;
+
+            Mods.ValueChanged += mods => applyRateAdjustments();
+        }
+
+        private void applyRateAdjustments()
+        {
+            var t = track;
+            if (t == null) return;
+
+            t.ResetSpeedAdjustments();
+            foreach (var mod in Mods.Value.OfType<IApplicableToClock>())
+                mod.ApplyToClock(t);
        }

        protected abstract Beatmap GetBeatmap();
@ -66,7 +79,11 @@ namespace osu.Game.Beatmaps
            {
                lock (trackLock)
                {
-                    return track ?? (track = GetTrack());
+                    if (track != null) return track;
+
+                    track = GetTrack();
+                    applyRateAdjustments();
+                    return track;
                }
            }
        }
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@ -38,6 +38,8 @@ namespace osu.Game.Configuration
            Set(OsuConfig.KeyOverlay, false);
            //todo: implement all settings below this line (remove the Disabled set when doing so).

+            Set(OsuConfig.AudioOffset, 0, -500.0, 500.0);
+
            Set(OsuConfig.MouseSpeed, 1.0).Disabled = true;
            Set(OsuConfig.BeatmapDirectory, @"Songs").Disabled = true; // TODO: use thi.Disabled = trues
            Set(OsuConfig.AllowPublicInvites, true).Disabled = true;
@ -103,7 +105,6 @@ namespace osu.Game.Configuration
            Set(OsuConfig.ManiaSpeedBPMScale, true).Disabled = true;
            Set(OsuConfig.MenuTip, 0).Disabled = true;
            Set(OsuConfig.MouseSpeed, 1, 0.4, 6).Disabled = true;
-            Set(OsuConfig.Offset, 0, -300, 300).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;
@ -270,7 +271,7 @@ namespace osu.Game.Configuration
        MouseDisableButtons,
        MouseDisableWheel,
        MouseSpeed,
-        Offset,
+        AudioOffset,
        ScoreMeterScale,
        DistanceSpacing,
        EditorBeatDivisor,
--- a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
@ -25,8 +25,6 @@ namespace osu.Game.Graphics.UserInterface
            {
                bindable = value;
                Current.BindTo(bindable);
-                if (value?.Disabled ?? true)
-                    Alpha = 0.3f;
            }
        }

@ -84,6 +82,11 @@ namespace osu.Game.Graphics.UserInterface
                else
                    sampleUnchecked?.Play();
            };
+
+            Current.DisabledChanged += disabled =>
+            {
+                Alpha = disabled ? 0.3f : 1;
+            };
        }

        protected override bool OnHover(InputState state)
--- a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
@ -74,6 +74,11 @@ namespace osu.Game.Graphics.UserInterface
                    Expanded = true,
                }
            };
+
+            Current.DisabledChanged += disabled =>
+            {
+                Alpha = disabled ? 0.3f : 1;
+            };
        }

        [BackgroundDependencyLoader]
--- a/osu.Game/Graphics/UserInterface/OsuTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTextBox.cs
@ -33,6 +33,11 @@ namespace osu.Game.Graphics.UserInterface
            Height = 40;
            TextContainer.Height = 0.5f;
            CornerRadius = 5;
+
+            Current.DisabledChanged += disabled =>
+            {
+                Alpha = disabled ? 0.3f : 1;
+            };
        }

        [BackgroundDependencyLoader]
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@ -203,13 +203,7 @@ namespace osu.Game
            {
                Depth = -3,
                OnHome = delegate { intro?.ChildScreen?.MakeCurrent(); },
-                OnRulesetChange = r => Ruleset.Value = r,
-            }, t =>
-            {
-                Ruleset.ValueChanged += delegate { Toolbar.SetRuleset(Ruleset.Value); };
-                Ruleset.TriggerChange();
-                overlayContent.Add(Toolbar);
-            });
+            }, overlayContent.Add);

            options.StateChanged += delegate
            {
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@ -147,8 +147,17 @@ namespace osu.Game
            {
                Children = new Drawable[]
                {
-                    Cursor = new MenuCursor { Depth = float.MinValue },
-                    new TooltipContainer(Cursor) { Depth = float.MinValue }
+                    new Container
+                    {
+                        AlwaysReceiveInput = true,
+                        RelativeSizeAxes = Axes.Both,
+                        Depth = float.MinValue,
+                        Children = new Drawable[]
+                        {
+                            Cursor = new MenuCursor(),
+                            new TooltipContainer(Cursor) { Depth = -1 },
+                        }
+                    },
                }
            });
        }
--- a/osu.Game/Overlays/Options/OptionDropdown.cs
+++ b/osu.Game/Overlays/Options/OptionDropdown.cs
@ -34,8 +34,6 @@ namespace osu.Game.Overlays.Options
            {
                bindable = value;
                dropdown.Current.BindTo(bindable);
-                if (value?.Disabled ?? true)
-                    Alpha = 0.3f;
            }
        }

@ -75,6 +73,11 @@ namespace osu.Game.Overlays.Options
                    Items = Items,
                }
            };
+
+            dropdown.Current.DisabledChanged += disabled =>
+            {
+                Alpha = disabled ? 0.3f : 1;
+            };
        }
    }
 }
--- a/osu.Game/Overlays/Options/OptionSlider.cs
+++ b/osu.Game/Overlays/Options/OptionSlider.cs
@ -35,8 +35,6 @@ namespace osu.Game.Overlays.Options
            {
                bindable = value;
                slider.Current.BindTo(bindable);
-                if (value?.Disabled ?? true)
-                    Alpha = 0.3f;
            }
        }

--- a/osu.Game/Overlays/Options/OptionTextBox.cs
+++ b/osu.Game/Overlays/Options/OptionTextBox.cs
@ -16,9 +16,7 @@ namespace osu.Game.Overlays.Options
            {
                bindable = value;
                Current.BindTo(bindable);
-                if (value?.Disabled ?? true)
-                    Alpha = 0.3f;
            }
        }
    }
-}
+}
--- a/osu.Game/Overlays/Options/Sections/Audio/OffsetOptions.cs
+++ b/osu.Game/Overlays/Options/Sections/Audio/OffsetOptions.cs
@ -18,10 +18,10 @@ namespace osu.Game.Overlays.Options.Sections.Audio
        {
            Children = new Drawable[]
            {
-                new OptionSlider<int>
+                new OptionSlider<double>
                {
-                    LabelText = "Universal Offset",
-                    Bindable = (BindableInt)config.GetBindable<int>(OsuConfig.Offset)
+                    LabelText = "Audio Offset",
+                    Bindable = (BindableDouble)config.GetBindable<double>(OsuConfig.AudioOffset)
                },
                new OsuButton
                {
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@ -8,7 +8,6 @@ using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input;
-using osu.Game.Database;
 using osu.Game.Graphics;
 using OpenTK;

@ -20,9 +19,7 @@ namespace osu.Game.Overlays.Toolbar
        public const float TOOLTIP_HEIGHT = 30;

        public Action OnHome;
-        public Action<RulesetInfo> OnRulesetChange;

-        private readonly ToolbarModeSelector modeSelector;
        private readonly ToolbarUserArea userArea;

        protected override bool HideOnEscape => false;
@ -53,13 +50,7 @@ namespace osu.Game.Overlays.Toolbar
                        {
                            Action = () => OnHome?.Invoke()
                        },
-                        modeSelector = new ToolbarModeSelector
-                        {
-                            OnRulesetChange = mode =>
-                            {
-                                OnRulesetChange?.Invoke(mode);
-                            }
-                        }
+                        new ToolbarModeSelector()
                    }
                },
                new FillFlowContainer
@ -130,8 +121,6 @@ namespace osu.Game.Overlays.Toolbar
            }
        }

-        public void SetRuleset(RulesetInfo ruleset) => modeSelector.SetRuleset(ruleset);
-
        protected override void PopIn()
        {
            MoveToY(0, transition_time, EasingTypes.OutQuint);
--- a/osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarModeSelector.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 System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Caching;
@ -12,6 +11,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Game.Database;
 using OpenTK;
 using OpenTK.Graphics;
+using osu.Framework.Configuration;

 namespace osu.Game.Overlays.Toolbar
 {
@ -23,7 +23,7 @@ namespace osu.Game.Overlays.Toolbar
        private readonly Drawable modeButtonLine;
        private ToolbarModeButton activeButton;

-        public Action<RulesetInfo> OnRulesetChange;
+        private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();

        public ToolbarModeSelector()
        {
@ -66,30 +66,36 @@ namespace osu.Game.Overlays.Toolbar
        }

        [BackgroundDependencyLoader]
-        private void load(RulesetDatabase rulesets)
+        private void load(RulesetDatabase rulesets, OsuGame game)
        {
-            foreach (var ruleset in rulesets.AllRulesets)
+            foreach (var r in rulesets.AllRulesets)
            {
                modeButtons.Add(new ToolbarModeButton
                {
-                    Ruleset = ruleset,
+                    Ruleset = r,
                    Action = delegate
                    {
-                        SetRuleset(ruleset);
-                        OnRulesetChange?.Invoke(ruleset);
+                        ruleset.Value = r;
                    }
                });
            }
+
+            ruleset.ValueChanged += rulesetChanged;
+            ruleset.DisabledChanged += disabledChanged;
+            ruleset.BindTo(game.Ruleset);
        }

+        public override bool HandleInput => !ruleset.Disabled;
+
+        private void disabledChanged(bool isDisabled) => FadeColour(isDisabled ? Color4.Gray : Color4.White, 300);
+
        protected override void Update()
        {
            base.Update();
-
            Size = new Vector2(modeButtons.DrawSize.X, 1);
        }

-        public void SetRuleset(RulesetInfo ruleset)
+        private void rulesetChanged(RulesetInfo ruleset)
        {
            foreach (ToolbarModeButton m in modeButtons.Children.Cast<ToolbarModeButton>())
            {
--- a/osu.Game/Rulesets/Judgements/IPartialJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/IPartialJudgement.cs
@ -1,22 +1,15 @@
 // 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.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Scoring;
-
 namespace osu.Game.Rulesets.Judgements
 {
    /// <summary>
    /// Inidicates that the judgement this is attached to is a partial judgement and the scoring value may change.
-    /// <para>
-    /// This judgement will be continually processed by <see cref="DrawableHitObject{TObject, TJudgement}.CheckJudgement(bool)"/>
-    /// unless the result is a miss and will trigger a full re-process of the <see cref="ScoreProcessor"/> when changed.
-    /// </para>
    /// </summary>
    public interface IPartialJudgement
    {
        /// <summary>
-        /// Indicates that this partial judgement has changed and requires a full re-process of the <see cref="ScoreProcessor"/>.
+        /// Indicates that this partial judgement has changed and requires reprocessing.
        /// <para>
        /// This is set to false once the judgement has been re-processed.
        /// </para>
--- a/osu.Game/Rulesets/Mods/IApplicableMod.cs
+++ b/osu.Game/Rulesets/Mods/IApplicableMod.cs
@ -17,6 +17,6 @@ namespace osu.Game.Rulesets.Mods
        /// Applies the mod to a HitRenderer.
        /// </summary>
        /// <param name="hitRenderer">The HitRenderer to apply the mod to.</param>
-        void Apply(HitRenderer<TObject> hitRenderer);
+        void ApplyToHitRenderer(HitRenderer<TObject> hitRenderer);
    }
 }
--- a/osu.Game/Rulesets/Mods/IApplicableToClock.cs
+++ b/osu.Game/Rulesets/Mods/IApplicableToClock.cs
@ -0,0 +1,15 @@
+// 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.Timing;
+
+namespace osu.Game.Rulesets.Mods
+{
+    /// <summary>
+    /// An interface for mods that make adjustments to the track.
+    /// </summary>
+    public interface IApplicableToClock
+    {
+        void ApplyToClock(IAdjustableClock clock);
+    }
+}
--- a/osu.Game/Rulesets/Mods/Mod.cs
+++ b/osu.Game/Rulesets/Mods/Mod.cs
@ -1,12 +1,8 @@
 // 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.Game.Beatmaps;
 using osu.Game.Graphics;
-using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.UI;
 using System;
-using osu.Game.Rulesets.Scoring;

 namespace osu.Game.Rulesets.Mods
 {
@ -45,131 +41,4 @@ namespace osu.Game.Rulesets.Mods
        /// </summary>
        public virtual Type[] IncompatibleMods => new Type[] { };
    }
-
-    public class MultiMod : Mod
-    {
-        public override string Name => string.Empty;
-        public override string Description => string.Empty;
-        public override double ScoreMultiplier => 0.0;
-
-        public Mod[] Mods;
-    }
-
-    public abstract class ModNoFail : Mod
-    {
-        public override string Name => "NoFail";
-        public override FontAwesome Icon => FontAwesome.fa_osu_mod_nofail;
-        public override string Description => "You can't fail, no matter what.";
-        public override double ScoreMultiplier => 0.5;
-        public override bool Ranked => true;
-        public override Type[] IncompatibleMods => new[] { typeof(ModRelax), typeof(ModSuddenDeath), typeof(ModAutoplay) };
-    }
-
-    public abstract class ModEasy : Mod
-    {
-        public override string Name => "Easy";
-        public override FontAwesome Icon => FontAwesome.fa_osu_mod_easy;
-        public override string Description => "Reduces overall difficulty - larger circles, more forgiving HP drain, less accuracy required.";
-        public override double ScoreMultiplier => 0.5;
-        public override bool Ranked => true;
-        public override Type[] IncompatibleMods => new[] { typeof(ModHardRock) };
-    }
-
-    public abstract class ModHidden : Mod
-    {
-        public override string Name => "Hidden";
-        public override FontAwesome Icon => FontAwesome.fa_osu_mod_hidden;
-        public override bool Ranked => true;
-    }
-
-    public abstract class ModHardRock : Mod
-    {
-        public override string Name => "Hard Rock";
-        public override FontAwesome Icon => FontAwesome.fa_osu_mod_hardrock;
-        public override string Description => "Everything just got a bit harder...";
-        public override Type[] IncompatibleMods => new[] { typeof(ModEasy) };
-    }
-
-    public abstract class ModSuddenDeath : Mod
-    {
-        public override string Name => "Sudden Death";
-        public override FontAwesome Icon => FontAwesome.fa_osu_mod_suddendeath;
-        public override string Description => "Miss a note and fail.";
-        public override double ScoreMultiplier => 1;
-        public override bool Ranked => true;
-        public override Type[] IncompatibleMods => new[] { typeof(ModNoFail), typeof(ModRelax), typeof(ModAutoplay) };
-    }
-
-    public abstract class ModDoubleTime : Mod
-    {
-        public override string Name => "Double Time";
-        public override FontAwesome Icon => FontAwesome.fa_osu_mod_doubletime;
-        public override string Description => "Zoooooooooom";
-        public override bool Ranked => true;
-        public override Type[] IncompatibleMods => new[] { typeof(ModHalfTime) };
-    }
-
-    public abstract class ModRelax : Mod
-    {
-        public override string Name => "Relax";
-        public override FontAwesome Icon => FontAwesome.fa_osu_mod_relax;
-        public override double ScoreMultiplier => 0;
-        public override Type[] IncompatibleMods => new[] { typeof(ModAutoplay), typeof(ModNoFail), typeof(ModSuddenDeath) };
-    }
-
-    public abstract class ModHalfTime : Mod
-    {
-        public override string Name => "Half Time";
-        public override FontAwesome Icon => FontAwesome.fa_osu_mod_halftime;
-        public override string Description => "Less zoom";
-        public override bool Ranked => true;
-        public override Type[] IncompatibleMods => new[] { typeof(ModDoubleTime) };
-    }
-
-    public abstract class ModNightcore : ModDoubleTime
-    {
-        public override string Name => "Nightcore";
-        public override FontAwesome Icon => FontAwesome.fa_osu_mod_nightcore;
-        public override string Description => "uguuuuuuuu";
-    }
-
-    public abstract class ModFlashlight : Mod
-    {
-        public override string Name => "Flashlight";
-        public override FontAwesome Icon => FontAwesome.fa_osu_mod_flashlight;
-        public override string Description => "Restricted view area.";
-        public override bool Ranked => true;
-    }
-
-    public class ModAutoplay : Mod
-    {
-        public override string Name => "Autoplay";
-        public override FontAwesome Icon => FontAwesome.fa_osu_mod_auto;
-        public override string Description => "Watch a perfect automated play through the song";
-        public override double ScoreMultiplier => 0;
-        public override Type[] IncompatibleMods => new[] { typeof(ModRelax), typeof(ModSuddenDeath), typeof(ModNoFail) };
-    }
-
-    public abstract class ModAutoplay<T> : ModAutoplay, IApplicableMod<T>
-        where T : HitObject
-    {
-        protected abstract Score CreateReplayScore(Beatmap<T> beatmap);
-
-        public void Apply(HitRenderer<T> hitRenderer)
-        {
-            hitRenderer.SetReplay(CreateReplayScore(hitRenderer.Beatmap)?.Replay);
-        }
-    }
-
-    public abstract class ModPerfect : ModSuddenDeath
-    {
-        public override string Name => "Perfect";
-        public override string Description => "SS or quit.";
-    }
-
-    public class ModCinema : ModAutoplay
-    {
-        public override string Name => "Cinema";
-        public override FontAwesome Icon => FontAwesome.fa_osu_mod_cinema;
-    }
 }
--- a/osu.Game/Rulesets/Mods/ModAutoplay.cs
+++ b/osu.Game/Rulesets/Mods/ModAutoplay.cs
@ -0,0 +1,32 @@
+// 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.Game.Beatmaps;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Rulesets.Mods
+{
+    public abstract class ModAutoplay<T> : ModAutoplay, IApplicableMod<T>
+        where T : HitObject
+    {
+        protected abstract Score CreateReplayScore(Beatmap<T> beatmap);
+
+        public void ApplyToHitRenderer(HitRenderer<T> hitRenderer)
+        {
+            hitRenderer.SetReplay(CreateReplayScore(hitRenderer.Beatmap)?.Replay);
+        }
+    }
+
+    public class ModAutoplay : Mod
+    {
+        public override string Name => "Autoplay";
+        public override FontAwesome Icon => FontAwesome.fa_osu_mod_auto;
+        public override string Description => "Watch a perfect automated play through the song";
+        public override double ScoreMultiplier => 0;
+        public override Type[] IncompatibleMods => new[] { typeof(ModRelax), typeof(ModSuddenDeath), typeof(ModNoFail) };
+    }
+}
--- a/osu.Game/Rulesets/Mods/ModCinema.cs
+++ b/osu.Game/Rulesets/Mods/ModCinema.cs
@ -0,0 +1,13 @@
+// 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.Game.Graphics;
+
+namespace osu.Game.Rulesets.Mods
+{
+    public class ModCinema : ModAutoplay
+    {
+        public override string Name => "Cinema";
+        public override FontAwesome Icon => FontAwesome.fa_osu_mod_cinema;
+    }
+}
--- a/osu.Game/Rulesets/Mods/ModDoubleTime.cs
+++ b/osu.Game/Rulesets/Mods/ModDoubleTime.cs
@ -0,0 +1,25 @@
+// 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.Timing;
+using osu.Game.Graphics;
+
+namespace osu.Game.Rulesets.Mods
+{
+    public class ModDoubleTime : Mod, IApplicableToClock
+    {
+        public override string Name => "Double Time";
+        public override FontAwesome Icon => FontAwesome.fa_osu_mod_doubletime;
+        public override string Description => "Zoooooooooom";
+        public override bool Ranked => true;
+        public override Type[] IncompatibleMods => new[] { typeof(ModHalfTime) };
+
+        public override double ScoreMultiplier => 1.12;
+
+        public virtual void ApplyToClock(IAdjustableClock clock)
+        {
+            clock.Rate = 1.5;
+        }
+    }
+}
--- a/osu.Game/Rulesets/Mods/ModEasy.cs
+++ b/osu.Game/Rulesets/Mods/ModEasy.cs
@ -0,0 +1,18 @@
+// 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.Game.Graphics;
+
+namespace osu.Game.Rulesets.Mods
+{
+    public abstract class ModEasy : Mod
+    {
+        public override string Name => "Easy";
+        public override FontAwesome Icon => FontAwesome.fa_osu_mod_easy;
+        public override string Description => "Reduces overall difficulty - larger circles, more forgiving HP drain, less accuracy required.";
+        public override double ScoreMultiplier => 0.5;
+        public override bool Ranked => true;
+        public override Type[] IncompatibleMods => new[] { typeof(ModHardRock) };
+    }
+}
--- a/osu.Game/Rulesets/Mods/ModFlashlight.cs
+++ b/osu.Game/Rulesets/Mods/ModFlashlight.cs
@ -0,0 +1,15 @@
+// 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.Game.Graphics;
+
+namespace osu.Game.Rulesets.Mods
+{
+    public abstract class ModFlashlight : Mod
+    {
+        public override string Name => "Flashlight";
+        public override FontAwesome Icon => FontAwesome.fa_osu_mod_flashlight;
+        public override string Description => "Restricted view area.";
+        public override bool Ranked => true;
+    }
+}
--- a/osu.Game/Rulesets/Mods/ModHalfTime.cs
+++ b/osu.Game/Rulesets/Mods/ModHalfTime.cs
@ -0,0 +1,25 @@
+// 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.Timing;
+using osu.Game.Graphics;
+
+namespace osu.Game.Rulesets.Mods
+{
+    public abstract class ModHalfTime : Mod, IApplicableToClock
+    {
+        public override string Name => "Half Time";
+        public override FontAwesome Icon => FontAwesome.fa_osu_mod_halftime;
+        public override string Description => "Less zoom";
+        public override bool Ranked => true;
+        public override Type[] IncompatibleMods => new[] { typeof(ModDoubleTime) };
+
+        public override double ScoreMultiplier => 1.12;
+
+        public void ApplyToClock(IAdjustableClock clock)
+        {
+            clock.Rate = 0.75;
+        }
+    }
+}
--- a/osu.Game/Rulesets/Mods/ModHardRock.cs
+++ b/osu.Game/Rulesets/Mods/ModHardRock.cs
@ -0,0 +1,16 @@
+// 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.Game.Graphics;
+
+namespace osu.Game.Rulesets.Mods
+{
+    public abstract class ModHardRock : Mod
+    {
+        public override string Name => "Hard Rock";
+        public override FontAwesome Icon => FontAwesome.fa_osu_mod_hardrock;
+        public override string Description => "Everything just got a bit harder...";
+        public override Type[] IncompatibleMods => new[] { typeof(ModEasy) };
+    }
+}
--- a/osu.Game/Rulesets/Mods/ModHidden.cs
+++ b/osu.Game/Rulesets/Mods/ModHidden.cs
@ -0,0 +1,14 @@
+// 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.Game.Graphics;
+
+namespace osu.Game.Rulesets.Mods
+{
+    public abstract class ModHidden : Mod
+    {
+        public override string Name => "Hidden";
+        public override FontAwesome Icon => FontAwesome.fa_osu_mod_hidden;
+        public override bool Ranked => true;
+    }
+}
--- a/osu.Game/Rulesets/Mods/ModNightcore.cs
+++ b/osu.Game/Rulesets/Mods/ModNightcore.cs
@ -0,0 +1,25 @@
+// 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.Audio;
+using osu.Framework.Timing;
+using osu.Game.Graphics;
+
+namespace osu.Game.Rulesets.Mods
+{
+    public abstract class ModNightcore : ModDoubleTime
+    {
+        public override string Name => "Nightcore";
+        public override FontAwesome Icon => FontAwesome.fa_osu_mod_nightcore;
+        public override string Description => "uguuuuuuuu";
+
+        public override void ApplyToClock(IAdjustableClock clock)
+        {
+            var pitchAdjust = clock as IHasPitchAdjust;
+            if (pitchAdjust != null)
+                pitchAdjust.PitchAdjust = 1.5;
+            else
+                base.ApplyToClock(clock);
+        }
+    }
+}
--- a/osu.Game/Rulesets/Mods/ModNoFail.cs
+++ b/osu.Game/Rulesets/Mods/ModNoFail.cs
@ -0,0 +1,18 @@
+// 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.Game.Graphics;
+
+namespace osu.Game.Rulesets.Mods
+{
+    public abstract class ModNoFail : Mod
+    {
+        public override string Name => "NoFail";
+        public override FontAwesome Icon => FontAwesome.fa_osu_mod_nofail;
+        public override string Description => "You can't fail, no matter what.";
+        public override double ScoreMultiplier => 0.5;
+        public override bool Ranked => true;
+        public override Type[] IncompatibleMods => new[] { typeof(ModRelax), typeof(ModSuddenDeath), typeof(ModAutoplay) };
+    }
+}
--- a/osu.Game/Rulesets/Mods/ModPerfect.cs
+++ b/osu.Game/Rulesets/Mods/ModPerfect.cs
@ -0,0 +1,11 @@
+// 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.Mods
+{
+    public abstract class ModPerfect : ModSuddenDeath
+    {
+        public override string Name => "Perfect";
+        public override string Description => "SS or quit.";
+    }
+}
--- a/osu.Game/Rulesets/Mods/ModRelax.cs
+++ b/osu.Game/Rulesets/Mods/ModRelax.cs
@ -0,0 +1,16 @@
+// 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.Game.Graphics;
+
+namespace osu.Game.Rulesets.Mods
+{
+    public abstract class ModRelax : Mod
+    {
+        public override string Name => "Relax";
+        public override FontAwesome Icon => FontAwesome.fa_osu_mod_relax;
+        public override double ScoreMultiplier => 0;
+        public override Type[] IncompatibleMods => new[] { typeof(ModAutoplay), typeof(ModNoFail), typeof(ModSuddenDeath) };
+    }
+}
--- a/osu.Game/Rulesets/Mods/ModSuddenDeath.cs
+++ b/osu.Game/Rulesets/Mods/ModSuddenDeath.cs
@ -0,0 +1,18 @@
+// 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.Game.Graphics;
+
+namespace osu.Game.Rulesets.Mods
+{
+    public abstract class ModSuddenDeath : Mod
+    {
+        public override string Name => "Sudden Death";
+        public override FontAwesome Icon => FontAwesome.fa_osu_mod_suddendeath;
+        public override string Description => "Miss a note and fail.";
+        public override double ScoreMultiplier => 1;
+        public override bool Ranked => true;
+        public override Type[] IncompatibleMods => new[] { typeof(ModNoFail), typeof(ModRelax), typeof(ModAutoplay) };
+    }
+}
--- a/osu.Game/Rulesets/Mods/MultiMod.cs
+++ b/osu.Game/Rulesets/Mods/MultiMod.cs
@ -0,0 +1,14 @@
+// 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.Mods
+{
+    public class MultiMod : Mod
+    {
+        public override string Name => string.Empty;
+        public override string Description => string.Empty;
+        public override double ScoreMultiplier => 0.0;
+
+        public Mod[] Mods;
+    }
+}
--- a/osu.Game/Rulesets/UI/HitRenderer.cs
+++ b/osu.Game/Rulesets/UI/HitRenderer.cs
@ -157,7 +157,7 @@ namespace osu.Game.Rulesets.UI
                return;

            foreach (var mod in mods.OfType<IApplicableMod<TObject>>())
-                mod.Apply(this);
+                mod.ApplyToHitRenderer(this);
        }

        /// <summary>
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@ -5,6 +5,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Configuration;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
+using osu.Game.Database;
 using osu.Game.Graphics.Containers;

 namespace osu.Game.Screens
@ -25,8 +26,12 @@ namespace osu.Game.Screens

        internal virtual bool HasLocalCursorDisplayed => false;

+        internal virtual bool AllowRulesetChange => true;
+
        private readonly Bindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();

+        private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
+
        public WorkingBeatmap Beatmap
        {
            get
@ -40,7 +45,7 @@ namespace osu.Game.Screens
        }

        [BackgroundDependencyLoader(permitNulls: true)]
-        private void load(OsuGameBase game)
+        private void load(OsuGameBase game, OsuGame osuGame)
        {
            if (game != null)
            {
@ -52,11 +57,23 @@ namespace osu.Game.Screens
            }

            beatmap.ValueChanged += OnBeatmapChanged;
+
+            if (osuGame != null)
+                ruleset.BindTo(osuGame.Ruleset);
        }

+        /// <summary>
+        /// The global Beatmap was changed.
+        /// </summary>
        protected virtual void OnBeatmapChanged(WorkingBeatmap beatmap)
        {
+        }

+        protected override void Update()
+        {
+            if (!IsCurrentScreen) return;
+
+            ruleset.Disabled = !AllowRulesetChange;
        }

        protected override void OnEntering(Screen last)
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@ -20,6 +20,7 @@ using osu.Game.Screens.Backgrounds;
 using System;
 using System.Linq;
 using osu.Framework.Threading;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Ranking;

@ -39,6 +40,8 @@ namespace osu.Game.Screens.Play

        public bool IsPaused => !interpolatedSourceClock.IsRunning;

+        internal override bool AllowRulesetChange => false;
+
        public bool HasFailed { get; private set; }

        public int RestartCount;
@ -49,13 +52,22 @@ namespace osu.Game.Screens.Play
        private bool canPause => ValidForResume && !HasFailed && Time.Current >= lastPauseActionTime + pause_cooldown;

        private IAdjustableClock sourceClock;
+        private OffsetClock offsetClock;
        private IFrameBasedClock interpolatedSourceClock;

        private RulesetInfo ruleset;

        private ScoreProcessor scoreProcessor;
        protected HitRenderer HitRenderer;
+
+        #region User Settings
+
        private Bindable<int> dimLevel;
+        private Bindable<bool> mouseWheelDisabled;
+        private Bindable<double> userAudioOffset;
+
+        #endregion
+
        private SkipButton skipButton;

        private HudOverlay hudOverlay;
@ -115,11 +127,19 @@ namespace osu.Game.Screens.Play
            }

            sourceClock = (IAdjustableClock)track ?? new StopwatchClock();
-            interpolatedSourceClock = new InterpolatingFramedClock(sourceClock);
+            offsetClock = new OffsetClock(sourceClock);
+
+            userAudioOffset = config.GetBindable<double>(OsuConfig.AudioOffset);
+            userAudioOffset.ValueChanged += v => offsetClock.Offset = v;
+            userAudioOffset.TriggerChange();
+
+            interpolatedSourceClock = new InterpolatingFramedClock(offsetClock);

            Schedule(() =>
            {
                sourceClock.Reset();
+                foreach (var mod in Beatmap.Mods.Value.OfType<IApplicableToClock>())
+                    mod.ApplyToClock(sourceClock);
            });

            scoreProcessor = HitRenderer.CreateScoreProcessor();
@ -360,8 +380,6 @@ namespace osu.Game.Screens.Play
            Background?.FadeTo(1f, fade_out_duration);
        }

-        private Bindable<bool> mouseWheelDisabled;
-
        protected override bool OnWheel(InputState state) => mouseWheelDisabled.Value && !IsPaused;
    }
 }
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@ -27,6 +27,8 @@ namespace osu.Game.Screens.Play
        private bool showOverlays = true;
        internal override bool ShowOverlays => showOverlays;

+        internal override bool AllowRulesetChange => false;
+
        protected override BackgroundScreen CreateBackground() => new BackgroundScreenBeatmap(Beatmap);

        public PlayerLoader(Player player)
--- a/osu.Game/Screens/Ranking/Results.cs
+++ b/osu.Game/Screens/Ranking/Results.cs
@ -31,6 +31,8 @@ namespace osu.Game.Screens.Ranking

        private ResultModeTabControl modeChangeButtons;

+        internal override bool AllowRulesetChange => false;
+
        private Container currentPage;

        private static readonly Vector2 background_blur = new Vector2(20);
--- a/osu.Game/Screens/ScreenWhiteBox.cs
+++ b/osu.Game/Screens/ScreenWhiteBox.cs
@ -7,12 +7,15 @@ using osu.Framework.Screens;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Screens.Backgrounds;
 using osu.Game.Graphics.UserInterface;
 using OpenTK;
 using OpenTK.Graphics;
+using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Game.Graphics;
+using osu.Framework.Extensions.Color4Extensions;

 namespace osu.Game.Screens
 {
@ -24,8 +27,8 @@ namespace osu.Game.Screens

        protected virtual IEnumerable<Type> PossibleChildren => null;

-        private readonly Container textContainer;
-        private readonly Box box;
+        private readonly FillFlowContainer textContainer;
+        private readonly Container boxContainer;

        protected override BackgroundScreen CreateBackground() => new BackgroundScreenCustom(@"Backgrounds/bg2");

@ -40,13 +43,13 @@ namespace osu.Game.Screens
            Content.Alpha = 0;
            textContainer.Position = new Vector2(DrawSize.X / 16, 0);

-            box.ScaleTo(0.2f);
-            box.RotateTo(-20);
+            boxContainer.ScaleTo(0.2f);
+            boxContainer.RotateTo(-20);

            Content.Delay(300, true);

-            box.ScaleTo(1, transition_time, EasingTypes.OutElastic);
-            box.RotateTo(0, transition_time / 2, EasingTypes.OutQuint);
+            boxContainer.ScaleTo(1, transition_time, EasingTypes.OutElastic);
+            boxContainer.RotateTo(0, transition_time / 2, EasingTypes.OutQuint);

            textContainer.MoveTo(Vector2.Zero, transition_time, EasingTypes.OutExpo);
            Content.FadeIn(transition_time, EasingTypes.OutExpo);
@ -82,36 +85,62 @@ namespace osu.Game.Screens

            Children = new Drawable[]
            {
-                box = new Box
+                boxContainer = new Container
                {
-                    RelativeSizeAxes = Axes.Both,
                    Size = new Vector2(0.3f),
+                    RelativeSizeAxes = Axes.Both,
+                    CornerRadius = 20,
+                    Masking = true,
                    Anchor = Anchor.Centre,
                    Origin = Anchor.Centre,
-                    Colour = getColourFor(GetType()),
-                    Alpha = 1,
-                    BlendingMode = BlendingMode.Additive,
-                },
-                textContainer = new Container
-                {
-                    AutoSizeAxes = Axes.Both,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Children = new[]
+                    Children = new Drawable[]
                    {
-                        new OsuSpriteText
+                        new Box
                        {
-                            Text = GetType().Name,
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            TextSize = 50,
+                            RelativeSizeAxes = Axes.Both,
+
+                            Colour = getColourFor(GetType()),
+                            Alpha = 0.2f,
+                            BlendingMode = BlendingMode.Additive,
                        },
-                        new OsuSpriteText
+                        textContainer = new FillFlowContainer
                        {
-                            Text = GetType().Namespace,
+                            AutoSizeAxes = Axes.Both,
                            Anchor = Anchor.Centre,
                            Origin = Anchor.Centre,
-                            Position = new Vector2(0, 30)
+                            Direction = FillDirection.Vertical,
+                            Children = new[]
+                            {
+                                new TextAwesome
+                                {
+                                    Icon = FontAwesome.fa_universal_access,
+                                    Anchor = Anchor.TopCentre,
+                                    Origin = Anchor.TopCentre,
+                                    TextSize = 50,
+                                },
+                                new OsuSpriteText
+                                {
+                                    Text = GetType().Name,
+                                    Colour = getColourFor(GetType()).Lighten(0.8f),
+                                    Anchor = Anchor.TopCentre,
+                                    Origin = Anchor.TopCentre,
+                                    TextSize = 50,
+                                },
+                                new OsuSpriteText
+                                {
+                                    Text = "is not yet ready for use!",
+                                    TextSize = 20,
+                                    Anchor = Anchor.TopCentre,
+                                    Origin = Anchor.TopCentre,
+                                },
+                                new OsuSpriteText
+                                {
+                                    Text = "please check back a bit later.",
+                                    TextSize = 14,
+                                    Anchor = Anchor.TopCentre,
+                                    Origin = Anchor.TopCentre,
+                                },
+                            }
                        },
                    }
                },
@ -120,17 +149,15 @@ namespace osu.Game.Screens
                    Anchor = Anchor.BottomLeft,
                    Origin = Anchor.BottomLeft,
                    Alpha = 0,
-                    Action = delegate {
-                        Exit();
-                    }
+                    Action = Exit
                },
                childModeButtons = new FillFlowContainer
                {
                    Direction = FillDirection.Vertical,
                    Anchor = Anchor.TopRight,
                    Origin = Anchor.TopRight,
-                    RelativeSizeAxes = Axes.Both,
-                    Size = new Vector2(0.1f, 1)
+                    RelativeSizeAxes = Axes.Y,
+                    Size = new Vector2(TwoLayerButton.SIZE_RETRACTED.X, 1)
                }
            };

@ -138,14 +165,11 @@ namespace osu.Game.Screens
            {
                foreach (Type t in PossibleChildren)
                {
-                    childModeButtons.Add(new Button
+                    childModeButtons.Add(new ChildModeButton
                    {
                        Text = $@"{t.Name}",
-                        RelativeSizeAxes = Axes.X,
-                        Size = new Vector2(1, 40),
-                        Anchor = Anchor.BottomRight,
-                        Origin = Anchor.BottomRight,
                        BackgroundColour = getColourFor(t),
+                        HoverColour = getColourFor(t).Lighten(0.2f),
                        Action = delegate
                        {
                            Push(Activator.CreateInstance(t) as Screen);
@ -163,5 +187,21 @@ namespace osu.Game.Screens
            byte b = (byte)MathHelper.Clamp((hash & 0x0000FF) * 0.8f, 20, 255);
            return new Color4(r, g, b, 255);
        }
+
+        public class ChildModeButton : TwoLayerButton
+        {
+            public ChildModeButton()
+            {
+                Icon = FontAwesome.fa_osu_right_o;
+                Anchor = Anchor.BottomRight;
+                Origin = Anchor.BottomRight;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(AudioManager audio)
+            {
+                ActivationSound = audio.Sample.Get(@"Menu/menuhit");
+            }
+        }
    }
 }
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@ -1,436 +1,451 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{0D3FBF8A-7464-4CF7-8C90-3E7886DF2D4D}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>osu.Game</RootNamespace>
-    <AssemblyName>osu.Game</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <LangVersion>6</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <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>
-    </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>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="SQLite.Net.Platform.Generic, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\SQLite.Net-PCL.3.1.1\lib\net40\SQLite.Net.Platform.Generic.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="SQLite.Net.Platform.Win32, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\SQLite.Net-PCL.3.1.1\lib\net4\SQLite.Net.Platform.Win32.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="DotNetZip">
-      <HintPath>$(SolutionDir)\packages\DotNetZip.1.10.1\lib\net20\DotNetZip.dll</HintPath>
-    </Reference>
-    <Reference Include="SQLiteNetExtensions">
-      <HintPath>$(SolutionDir)\packages\SQLiteNetExtensions.1.3.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\SQLiteNetExtensions.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Audio\SampleInfo.cs" />
-    <Compile Include="Beatmaps\Drawables\BeatmapBackgroundSprite.cs" />
-    <Compile Include="Beatmaps\DifficultyCalculator.cs" />
-    <Compile Include="Online\API\Requests\PostMessageRequest.cs" />
-    <Compile Include="Overlays\Toolbar\ToolbarChatButton.cs" />
-    <Compile Include="Rulesets\Beatmaps\BeatmapConverter.cs" />
-    <Compile Include="Rulesets\Beatmaps\BeatmapProcessor.cs" />
-    <Compile Include="Beatmaps\Legacy\LegacyBeatmap.cs" />
-    <Compile Include="Beatmaps\Timing\TimeSignatures.cs" />
-    <Compile Include="Beatmaps\Timing\TimingInfo.cs" />
-    <Compile Include="Database\BeatmapMetrics.cs" />
-    <Compile Include="Database\Database.cs" />
-    <Compile Include="Database\RulesetInfo.cs" />
-    <Compile Include="Database\ScoreDatabase.cs" />
-    <Compile Include="Graphics\Backgrounds\Triangles.cs" />
-    <Compile Include="Graphics\Cursor\CursorTrail.cs" />
-    <Compile Include="Graphics\Cursor\GameplayCursor.cs" />
-    <Compile Include="Graphics\IHasAccentColour.cs" />
-    <Compile Include="Graphics\IHasTooltip.cs" />
-    <Compile Include="Graphics\Sprites\OsuSpriteText.cs" />
-    <Compile Include="Graphics\Transforms\TransformAccent.cs" />
-    <Compile Include="Graphics\UserInterface\BackButton.cs" />
-    <Compile Include="Graphics\UserInterface\Bar.cs" />
-    <Compile Include="Graphics\UserInterface\FocusedTextBox.cs" />
-    <Compile Include="Graphics\UserInterface\Nub.cs" />
-    <Compile Include="Graphics\UserInterface\OsuMenu.cs" />
-    <Compile Include="Graphics\UserInterface\OsuPasswordTextBox.cs" />
-    <Compile Include="Graphics\UserInterface\OsuSliderBar.cs" />
-    <Compile Include="Graphics\UserInterface\OsuTextBox.cs" />
-    <Compile Include="Graphics\UserInterface\SimpleComboCounter.cs" />
-    <Compile Include="Graphics\UserInterface\TwoLayerButton.cs" />
-    <Compile Include="Graphics\Cursor\TooltipContainer.cs" />
-    <Compile Include="Input\Handlers\ReplayInputHandler.cs" />
-    <Compile Include="IO\Legacy\ILegacySerializable.cs" />
-    <Compile Include="IO\Legacy\SerializationReader.cs" />
-    <Compile Include="IO\Legacy\SerializationWriter.cs" />
-    <Compile Include="IO\Serialization\IJsonSerializable.cs" />
-    <Compile Include="IPC\ScoreIPCChannel.cs" />
-    <Compile Include="Rulesets\BeatmapStatistic.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\Catch\ConvertHit.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\Catch\ConvertHitObjectParser.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\Catch\ConvertSlider.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\Catch\ConvertSpinner.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\ConvertSlider.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\Mania\ConvertHit.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\Mania\ConvertHitObjectParser.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\Mania\ConvertSlider.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\Mania\ConvertSpinner.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\Osu\ConvertHitObjectParser.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\Taiko\ConvertHit.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\Taiko\ConvertHitObjectParser.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\Taiko\ConvertSlider.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\Taiko\ConvertSpinner.cs" />
-    <Compile Include="Rulesets\Objects\Types\IHasXPosition.cs" />
-    <Compile Include="Rulesets\Objects\Types\IHasYPosition.cs" />
-    <Compile Include="Rulesets\Replays\Replay.cs" />
-    <Compile Include="Rulesets\Judgements\DrawableJudgement.cs" />
-    <Compile Include="Rulesets\Judgements\IPartialJudgement.cs" />
-    <Compile Include="Rulesets\Replays\FramedReplayInputHandler.cs" />
-    <Compile Include="Rulesets\Mods\IApplicableMod.cs" />
-    <Compile Include="Rulesets\Mods\ModType.cs" />
-    <Compile Include="Rulesets\Objects\Drawables\ArmedState.cs" />
-    <Compile Include="Rulesets\Objects\Drawables\HitResult.cs" />
-    <Compile Include="Rulesets\Objects\BezierApproximator.cs" />
-    <Compile Include="Rulesets\Objects\CircularArcApproximator.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\Osu\ConvertHit.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\ConvertHitObjectParser.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\ConvertHold.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\Osu\ConvertSlider.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\Osu\ConvertSpinner.cs" />
-    <Compile Include="Rulesets\Objects\SliderCurve.cs" />
-    <Compile Include="Rulesets\Objects\Types\CurveType.cs" />
-    <Compile Include="Rulesets\Objects\Drawables\IDrawableHitObjectWithProxiedApproach.cs" />
-    <Compile Include="Rulesets\Judgements\Judgement.cs" />
-    <Compile Include="Rulesets\Objects\HitObjectParser.cs" />
-    <Compile Include="Rulesets\Objects\Types\IHasCombo.cs" />
-    <Compile Include="Rulesets\Objects\Types\IHasEndTime.cs" />
-    <Compile Include="Rulesets\Objects\Types\IHasDistance.cs" />
-    <Compile Include="Rulesets\Objects\Types\IHasCurve.cs" />
-    <Compile Include="Rulesets\Objects\Types\IHasRepeats.cs" />
-    <Compile Include="Rulesets\Objects\Types\IHasPosition.cs" />
-    <Compile Include="Rulesets\Objects\Types\IHasHold.cs" />
-    <Compile Include="Rulesets\Objects\Legacy\ConvertHitObjectType.cs" />
-    <Compile Include="Rulesets\Replays\ReplayButtonState.cs" />
-    <Compile Include="Rulesets\Replays\ReplayFrame.cs" />
-    <Compile Include="Database\RulesetDatabase.cs" />
-    <Compile Include="Rulesets\Scoring\Score.cs" />
-    <Compile Include="Rulesets\Scoring\ScoreProcessor.cs" />
-    <Compile Include="Rulesets\UI\HealthDisplay.cs" />
-    <Compile Include="Rulesets\UI\HudOverlay.cs" />
-    <Compile Include="Rulesets\UI\StandardHealthDisplay.cs" />
-    <Compile Include="Rulesets\UI\StandardHudOverlay.cs" />
-    <Compile Include="Online\API\IOnlineComponent.cs" />
-    <Compile Include="Online\API\Requests\GetScoresRequest.cs" />
-    <Compile Include="Online\API\Requests\GetUserRequest.cs" />
-    <Compile Include="Overlays\DragBar.cs" />
-    <Compile Include="Overlays\LoginOverlay.cs" />
-    <Compile Include="Overlays\MusicController.cs" />
-    <Compile Include="Beatmaps\Beatmap.cs" />
-    <Compile Include="Beatmaps\WorkingBeatmap.cs" />
-    <Compile Include="Beatmaps\Drawables\BeatmapSetHeader.cs" />
-    <Compile Include="Beatmaps\Drawables\DifficultyIcon.cs" />
-    <Compile Include="Beatmaps\Drawables\Panel.cs" />
-    <Compile Include="Rulesets\Objects\Drawables\DrawableHitObject.cs" />
-    <Compile Include="Rulesets\Objects\HitObject.cs" />
-    <Compile Include="Beatmaps\Timing\ControlPoint.cs" />
-    <Compile Include="Configuration\OsuConfigManager.cs" />
-    <Compile Include="Overlays\Notifications\IHasCompletionTarget.cs" />
-    <Compile Include="Overlays\Notifications\Notification.cs" />
-    <Compile Include="Overlays\NotificationManager.cs" />
-    <Compile Include="Overlays\Notifications\NotificationSection.cs" />
-    <Compile Include="Overlays\Notifications\ProgressCompletionNotification.cs" />
-    <Compile Include="Overlays\Notifications\ProgressNotification.cs" />
-    <Compile Include="Overlays\Notifications\SimpleNotification.cs" />
-    <Compile Include="Overlays\Options\OptionDropdown.cs" />
-    <Compile Include="Overlays\Options\OptionLabel.cs" />
-    <Compile Include="Graphics\UserInterface\OsuDropdown.cs" />
-    <Compile Include="Overlays\Options\OptionsFooter.cs" />
-    <Compile Include="Overlays\Options\Sections\DebugSection.cs" />
-    <Compile Include="Overlays\Options\Sections\Debug\GeneralOptions.cs" />
-    <Compile Include="Overlays\Options\Sections\Debug\GCOptions.cs" />
-    <Compile Include="Overlays\Toolbar\ToolbarHomeButton.cs" />
-    <Compile Include="Overlays\Toolbar\ToolbarMusicButton.cs" />
-    <Compile Include="Overlays\Toolbar\ToolbarNotificationButton.cs" />
-    <Compile Include="Overlays\Toolbar\ToolbarSettingsButton.cs" />
-    <Compile Include="Overlays\Toolbar\ToolbarOverlayToggleButton.cs" />
-    <Compile Include="Overlays\Toolbar\ToolbarUserArea.cs" />
-    <Compile Include="Overlays\Toolbar\ToolbarUserButton.cs" />
-    <Compile Include="Screens\BackgroundScreen.cs" />
-    <Compile Include="Screens\Backgrounds\BackgroundScreenBeatmap.cs" />
-    <Compile Include="Screens\Backgrounds\BackgroundScreenCustom.cs" />
-    <Compile Include="Screens\Backgrounds\BackgroundScreenDefault.cs" />
-    <Compile Include="Screens\Backgrounds\BackgroundScreenEmpty.cs" />
-    <Compile Include="Screens\Charts\ChartInfo.cs" />
-    <Compile Include="Screens\Edit\Editor.cs" />
-    <Compile Include="Screens\Play\HotkeyRetryOverlay.cs" />
-    <Compile Include="Screens\Play\SquareGraph.cs" />
-    <Compile Include="Screens\Ranking\ResultsPage.cs" />
-    <Compile Include="Screens\Ranking\ResultsPageRanking.cs" />
-    <Compile Include="Screens\Ranking\ResultsPageScore.cs" />
-    <Compile Include="Screens\ScreenWhiteBox.cs" />
-    <Compile Include="Screens\Loader.cs" />
-    <Compile Include="Screens\Menu\Button.cs" />
-    <Compile Include="Screens\Menu\Disclaimer.cs" />
-    <Compile Include="Screens\Menu\FlowContainerWithOrigin.cs" />
-    <Compile Include="Screens\Menu\Intro.cs" />
-    <Compile Include="Screens\Menu\ButtonSystem.cs" />
-    <Compile Include="Screens\Menu\MainMenu.cs" />
-    <Compile Include="Screens\Menu\MenuVisualisation.cs" />
-    <Compile Include="Screens\Menu\OsuLogo.cs" />
-    <Compile Include="Screens\Multiplayer\Lobby.cs" />
-    <Compile Include="Screens\Multiplayer\Match.cs" />
-    <Compile Include="Screens\Multiplayer\MatchCreate.cs" />
-    <Compile Include="Screens\Play\FailOverlay.cs" />
-    <Compile Include="Screens\Play\MenuOverlay.cs" />
-    <Compile Include="Screens\Play\KeyConversionInputManager.cs" />
-    <Compile Include="Screens\Play\PauseOverlay.cs" />
-    <Compile Include="Screens\Play\Pause\PauseButton.cs" />
-    <Compile Include="Screens\Play\PlayerInputManager.cs" />
-    <Compile Include="Screens\Play\PlayerLoader.cs" />
-    <Compile Include="Screens\Play\ReplayPlayer.cs" />
-    <Compile Include="Screens\Play\SkipButton.cs" />
-    <Compile Include="Rulesets\UI\StandardComboCounter.cs" />
-    <Compile Include="Screens\Ranking\AspectContainer.cs" />
-    <Compile Include="Screens\Ranking\ResultMode.cs" />
-    <Compile Include="Screens\Ranking\ResultModeButton.cs" />
-    <Compile Include="Screens\Ranking\ResultModeTabControl.cs" />
-    <Compile Include="Screens\Select\BeatmapCarousel.cs" />
-    <Compile Include="Screens\Select\BeatmapDetails.cs" />
-    <Compile Include="Graphics\UserInterface\BarGraph.cs" />
-    <Compile Include="Screens\Select\FilterCriteria.cs" />
-    <Compile Include="Screens\Select\Filter\GroupMode.cs" />
-    <Compile Include="Screens\Select\Filter\SortMode.cs" />
-    <Compile Include="Screens\Select\MatchSongSelect.cs" />
-    <Compile Include="Screens\OsuScreen.cs" />
-    <Compile Include="Beatmaps\Drawables\BeatmapGroup.cs" />
-    <Compile Include="Beatmaps\Drawables\BeatmapPanel.cs" />
-    <Compile Include="Screens\Play\Player.cs" />
-    <Compile Include="Screens\Charts\ChartListing.cs" />
-    <Compile Include="Rulesets\Ruleset.cs" />
-    <Compile Include="Screens\Ranking\Results.cs" />
-    <Compile Include="Screens\Direct\OnlineListing.cs" />
-    <Compile Include="Screens\Select\PlaySongSelect.cs" />
-    <Compile Include="Screens\Select\SongSelect.cs" />
-    <Compile Include="Rulesets\UI\HitRenderer.cs" />
-    <Compile Include="Rulesets\UI\Playfield.cs" />
-    <Compile Include="Screens\Select\EditSongSelect.cs" />
-    <Compile Include="Rulesets\UI\ComboCounter.cs" />
-    <Compile Include="Rulesets\UI\ComboResultCounter.cs" />
-    <Compile Include="Graphics\UserInterface\RollingCounter.cs" />
-    <Compile Include="Graphics\UserInterface\Volume\VolumeControlReceptor.cs" />
-    <Compile Include="Input\GlobalHotkeys.cs" />
-    <Compile Include="Graphics\Backgrounds\Background.cs" />
-    <Compile Include="Graphics\Containers\ParallaxContainer.cs" />
-    <Compile Include="Graphics\Cursor\MenuCursor.cs" />
-    <Compile Include="Graphics\Processing\RatioAdjust.cs" />
-    <Compile Include="Graphics\TextAwesome.cs" />
-    <Compile Include="Screens\Play\KeyCounter.cs" />
-    <Compile Include="Screens\Play\KeyCounterKeyboard.cs" />
-    <Compile Include="Screens\Play\KeyCounterCollection.cs" />
-    <Compile Include="Screens\Play\KeyCounterMouse.cs" />
-    <Compile Include="Graphics\UserInterface\PercentageCounter.cs" />
-    <Compile Include="Graphics\UserInterface\ScoreCounter.cs" />
-    <Compile Include="Graphics\UserInterface\StarCounter.cs" />
-    <Compile Include="IPC\BeatmapIPCChannel.cs" />
-    <Compile Include="Online\API\APIAccess.cs" />
-    <Compile Include="Online\API\APIRequest.cs" />
-    <Compile Include="Online\API\OAuth.cs" />
-    <Compile Include="Online\API\OAuthToken.cs" />
-    <Compile Include="Online\API\Requests\GetMessagesRequest.cs" />
-    <Compile Include="Online\API\Requests\ListChannelsRequest.cs" />
-    <Compile Include="Online\Chat\Channel.cs" />
-    <Compile Include="Online\Chat\Drawables\DrawableChannel.cs" />
-    <Compile Include="Online\Chat\Drawables\ChatLine.cs" />
-    <Compile Include="Online\Chat\Message.cs" />
-    <Compile Include="OsuGame.cs" />
-    <Compile Include="OsuGameBase.cs" />
-    <Compile Include="Overlays\ChatOverlay.cs" />
-    <Compile Include="Overlays\OptionsOverlay.cs" />
-    <Compile Include="Overlays\Toolbar\Toolbar.cs" />
-    <Compile Include="Overlays\Toolbar\ToolbarButton.cs" />
-    <Compile Include="Overlays\Toolbar\ToolbarModeButton.cs" />
-    <Compile Include="Overlays\Toolbar\ToolbarModeSelector.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Screens\Select\BeatmapInfoWedge.cs" />
-    <Compile Include="Screens\Select\WedgeBackground.cs" />
-    <Compile Include="Screens\Tournament\Components\DrawingsConfigManager.cs" />
-    <Compile Include="Screens\Tournament\Components\VisualiserContainer.cs" />
-    <Compile Include="Screens\Tournament\Drawings.cs" />
-    <Compile Include="Screens\Tournament\Group.cs" />
-    <Compile Include="Screens\Tournament\GroupContainer.cs" />
-    <Compile Include="Screens\Tournament\Teams\ITeamList.cs" />
-    <Compile Include="Screens\Tournament\ScrollingTeamContainer.cs" />
-    <Compile Include="Screens\Tournament\Teams\StorageBackedTeamList.cs" />
-    <Compile Include="Users\UpdateableAvatar.cs" />
-    <Compile Include="Users\User.cs" />
-    <Compile Include="Graphics\UserInterface\Volume\VolumeControl.cs" />
-    <Compile Include="Database\BeatmapDatabase.cs" />
-    <Compile Include="Beatmaps\IO\ArchiveReader.cs" />
-    <Compile Include="Beatmaps\Formats\BeatmapDecoder.cs" />
-    <Compile Include="Beatmaps\Formats\OsuLegacyDecoder.cs" />
-    <Compile Include="Beatmaps\IO\OszArchiveReader.cs" />
-    <Compile Include="Beatmaps\Events\EventType.cs" />
-    <Compile Include="Graphics\UserInterface\Volume\VolumeMeter.cs" />
-    <Compile Include="Database\BeatmapSetInfo.cs" />
-    <Compile Include="Database\BeatmapMetadata.cs" />
-    <Compile Include="Database\BeatmapInfo.cs" />
-    <Compile Include="Database\BeatmapDifficulty.cs" />
-    <Compile Include="Database\DatabaseWorkingBeatmap.cs" />
-    <Compile Include="Graphics\UserInterface\OsuButton.cs" />
-    <Compile Include="Overlays\Options\Sections\MaintenanceSection.cs" />
-    <Compile Include="Overlays\Options\OptionsSection.cs" />
-    <Compile Include="Overlays\Options\OptionsSubsection.cs" />
-    <Compile Include="Graphics\UserInterface\LoadingAnimation.cs" />
-    <Compile Include="Overlays\Options\Sidebar.cs" />
-    <Compile Include="Overlays\Options\Sections\GeneralSection.cs" />
-    <Compile Include="Overlays\Options\Sections\General\LoginOptions.cs" />
-    <Compile Include="Overlays\Options\Sections\General\UpdateOptions.cs" />
-    <Compile Include="Overlays\Options\Sections\General\LanguageOptions.cs" />
-    <Compile Include="Overlays\Options\Sections\GraphicsSection.cs" />
-    <Compile Include="Overlays\Options\Sections\Graphics\RendererOptions.cs" />
-    <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" />
-    <Compile Include="Overlays\Options\Sections\AudioSection.cs" />
-    <Compile Include="Overlays\Options\Sections\Audio\AudioDevicesOptions.cs" />
-    <Compile Include="Overlays\Options\Sections\Audio\VolumeOptions.cs" />
-    <Compile Include="Overlays\Options\Sections\Audio\OffsetOptions.cs" />
-    <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" />
-    <Compile Include="Screens\Select\FooterButton.cs" />
-    <Compile Include="Screens\Select\Footer.cs" />
-    <Compile Include="Screens\Play\SongProgress.cs" />
-    <Compile Include="Screens\Play\SongProgressGraph.cs" />
-    <Compile Include="Screens\Play\SongProgressBar.cs" />
-    <Compile Include="Screens\Play\Pause\PauseProgressBar.cs" />
-    <Compile Include="Screens\Play\Pause\PauseProgressGraph.cs" />
-    <Compile Include="Overlays\Mods\ModSelectOverlay.cs" />
-    <Compile Include="Rulesets\Mods\Mod.cs" />
-    <Compile Include="Overlays\Mods\ModButton.cs" />
-    <Compile Include="Rulesets\UI\ModIcon.cs" />
-    <Compile Include="Overlays\Mods\ModSection.cs" />
-    <Compile Include="Overlays\Mods\DifficultyReductionSection.cs" />
-    <Compile Include="Overlays\Mods\DifficultyIncreaseSection.cs" />
-    <Compile Include="Overlays\Dialog\PopupDialog.cs" />
-    <Compile Include="Graphics\UserInterface\DialogButton.cs" />
-    <Compile Include="Overlays\Dialog\PopupDialogButton.cs" />
-    <Compile Include="Overlays\Dialog\PopupDialogOkButton.cs" />
-    <Compile Include="Overlays\Dialog\PopupDialogCancelButton.cs" />
-    <Compile Include="Screens\Select\BeatmapDeleteDialog.cs" />
-    <Compile Include="Overlays\DialogOverlay.cs" />
-    <Compile Include="Overlays\Mods\AssistedSection.cs" />
-    <Compile Include="Overlays\WaveOverlayContainer.cs" />
-    <Compile Include="Screens\Select\Options\BeatmapOptionsButton.cs" />
-    <Compile Include="Screens\Select\Options\BeatmapOptionsOverlay.cs" />
-    <Compile Include="Screens\Select\Leaderboards\Leaderboard.cs" />
-    <Compile Include="Screens\Select\Leaderboards\LeaderboardScore.cs" />
-    <Compile Include="Users\Country.cs" />
-    <Compile Include="Users\Team.cs" />
-    <Compile Include="Rulesets\Scoring\ScoreRank.cs" />
-    <Compile Include="Users\Avatar.cs" />
-    <Compile Include="Screens\Select\Leaderboards\DrawableRank.cs" />
-    <Compile Include="Graphics\UserInterface\OsuTabControl.cs" />
-    <Compile Include="Screens\Select\BeatmapDetailArea.cs" />
-    <Compile Include="Graphics\UserInterface\OsuTabControlCheckbox.cs" />
-    <Compile Include="Screens\Select\BeatmapDetailAreaTabControl.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="$(SolutionDir)\osu-framework\osu.Framework\osu.Framework.csproj">
-      <Project>{c76bf5b3-985e-4d39-95fe-97c9c879b83a}</Project>
-      <Name>osu.Framework</Name>
-    </ProjectReference>
-    <ProjectReference Include="$(SolutionDir)\osu-resources\osu.Game.Resources\osu.Game.Resources.csproj">
-      <Project>{d9a367c9-4c1a-489f-9b05-a0cea2b53b58}</Project>
-      <Name>osu.Game.Resources</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\osu.licenseheader">
-      <Link>osu.licenseheader</Link>
-    </None>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup />
-  <ItemGroup />
-  <ItemGroup />
-  <ItemGroup />
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{0D3FBF8A-7464-4CF7-8C90-3E7886DF2D4D}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>osu.Game</RootNamespace>
+    <AssemblyName>osu.Game</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <LangVersion>6</LangVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <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>
+    </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>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SQLite.Net.Platform.Generic, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\SQLite.Net-PCL.3.1.1\lib\net40\SQLite.Net.Platform.Generic.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SQLite.Net.Platform.Win32, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\SQLite.Net-PCL.3.1.1\lib\net4\SQLite.Net.Platform.Win32.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="DotNetZip">
+      <HintPath>$(SolutionDir)\packages\DotNetZip.1.10.1\lib\net20\DotNetZip.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLiteNetExtensions">
+      <HintPath>$(SolutionDir)\packages\SQLiteNetExtensions.1.3.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\SQLiteNetExtensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Audio\SampleInfo.cs" />
+    <Compile Include="Beatmaps\Drawables\BeatmapBackgroundSprite.cs" />
+    <Compile Include="Beatmaps\DifficultyCalculator.cs" />
+    <Compile Include="Online\API\Requests\PostMessageRequest.cs" />
+    <Compile Include="Overlays\Toolbar\ToolbarChatButton.cs" />
+    <Compile Include="Rulesets\Beatmaps\BeatmapConverter.cs" />
+    <Compile Include="Rulesets\Beatmaps\BeatmapProcessor.cs" />
+    <Compile Include="Beatmaps\Legacy\LegacyBeatmap.cs" />
+    <Compile Include="Beatmaps\Timing\TimeSignatures.cs" />
+    <Compile Include="Beatmaps\Timing\TimingInfo.cs" />
+    <Compile Include="Database\BeatmapMetrics.cs" />
+    <Compile Include="Database\Database.cs" />
+    <Compile Include="Database\RulesetInfo.cs" />
+    <Compile Include="Database\ScoreDatabase.cs" />
+    <Compile Include="Graphics\Backgrounds\Triangles.cs" />
+    <Compile Include="Graphics\Cursor\CursorTrail.cs" />
+    <Compile Include="Graphics\Cursor\GameplayCursor.cs" />
+    <Compile Include="Graphics\IHasAccentColour.cs" />
+    <Compile Include="Graphics\IHasTooltip.cs" />
+    <Compile Include="Graphics\Sprites\OsuSpriteText.cs" />
+    <Compile Include="Graphics\Transforms\TransformAccent.cs" />
+    <Compile Include="Graphics\UserInterface\BackButton.cs" />
+    <Compile Include="Graphics\UserInterface\Bar.cs" />
+    <Compile Include="Graphics\UserInterface\FocusedTextBox.cs" />
+    <Compile Include="Graphics\UserInterface\Nub.cs" />
+    <Compile Include="Graphics\UserInterface\OsuMenu.cs" />
+    <Compile Include="Graphics\UserInterface\OsuPasswordTextBox.cs" />
+    <Compile Include="Graphics\UserInterface\OsuSliderBar.cs" />
+    <Compile Include="Graphics\UserInterface\OsuTextBox.cs" />
+    <Compile Include="Graphics\UserInterface\SimpleComboCounter.cs" />
+    <Compile Include="Graphics\UserInterface\TwoLayerButton.cs" />
+    <Compile Include="Graphics\Cursor\TooltipContainer.cs" />
+    <Compile Include="Input\Handlers\ReplayInputHandler.cs" />
+    <Compile Include="IO\Legacy\ILegacySerializable.cs" />
+    <Compile Include="IO\Legacy\SerializationReader.cs" />
+    <Compile Include="IO\Legacy\SerializationWriter.cs" />
+    <Compile Include="IO\Serialization\IJsonSerializable.cs" />
+    <Compile Include="IPC\ScoreIPCChannel.cs" />
+    <Compile Include="Rulesets\BeatmapStatistic.cs" />
+    <Compile Include="Rulesets\Objects\Legacy\Catch\ConvertHit.cs" />
+    <Compile Include="Rulesets\Objects\Legacy\Catch\ConvertHitObjectParser.cs" />
+    <Compile Include="Rulesets\Objects\Legacy\Catch\ConvertSlider.cs" />
+    <Compile Include="Rulesets\Objects\Legacy\Catch\ConvertSpinner.cs" />
+    <Compile Include="Rulesets\Objects\Legacy\ConvertSlider.cs" />
+    <Compile Include="Rulesets\Objects\Legacy\Mania\ConvertHit.cs" />
+    <Compile Include="Rulesets\Objects\Legacy\Mania\ConvertHitObjectParser.cs" />
+    <Compile Include="Rulesets\Objects\Legacy\Mania\ConvertSlider.cs" />
+    <Compile Include="Rulesets\Objects\Legacy\Mania\ConvertSpinner.cs" />
+    <Compile Include="Rulesets\Objects\Legacy\Osu\ConvertHitObjectParser.cs" />
+    <Compile Include="Rulesets\Objects\Legacy\Taiko\ConvertHit.cs" />
+    <Compile Include="Rulesets\Objects\Legacy\Taiko\ConvertHitObjectParser.cs" />
+    <Compile Include="Rulesets\Objects\Legacy\Taiko\ConvertSlider.cs" />
+    <Compile Include="Rulesets\Objects\Legacy\Taiko\ConvertSpinner.cs" />
+    <Compile Include="Rulesets\Mods\IApplicableToClock.cs" />
+    <Compile Include="Rulesets\Mods\ModAutoplay.cs" />
+    <Compile Include="Rulesets\Mods\ModCinema.cs" />
+    <Compile Include="Rulesets\Mods\ModDoubleTime.cs" />
+    <Compile Include="Rulesets\Mods\ModEasy.cs" />
+    <Compile Include="Rulesets\Mods\ModFlashlight.cs" />
+    <Compile Include="Rulesets\Mods\ModHalfTime.cs" />
+    <Compile Include="Rulesets\Mods\ModHardRock.cs" />
+    <Compile Include="Rulesets\Mods\ModHidden.cs" />
+    <Compile Include="Rulesets\Mods\ModNightcore.cs" />
+    <Compile Include="Rulesets\Mods\ModNoFail.cs" />
+    <Compile Include="Rulesets\Mods\ModPerfect.cs" />
+    <Compile Include="Rulesets\Mods\ModRelax.cs" />
+    <Compile Include="Rulesets\Mods\ModSuddenDeath.cs" />
+    <Compile Include="Rulesets\Mods\MultiMod.cs" />
+    <Compile Include="Rulesets\Objects\Types\IHasXPosition.cs" />
+    <Compile Include="Rulesets\Objects\Types\IHasYPosition.cs" />
+    <Compile Include="Rulesets\Replays\Replay.cs" />
+    <Compile Include="Rulesets\Judgements\DrawableJudgement.cs" />
+    <Compile Include="Rulesets\Judgements\IPartialJudgement.cs" />
+    <Compile Include="Rulesets\Replays\FramedReplayInputHandler.cs" />
+    <Compile Include="Rulesets\Mods\IApplicableMod.cs" />
+    <Compile Include="Rulesets\Mods\ModType.cs" />
+    <Compile Include="Rulesets\Objects\Drawables\ArmedState.cs" />
+    <Compile Include="Rulesets\Objects\Drawables\HitResult.cs" />
+    <Compile Include="Rulesets\Objects\BezierApproximator.cs" />
+    <Compile Include="Rulesets\Objects\CircularArcApproximator.cs" />
+    <Compile Include="Rulesets\Objects\Legacy\Osu\ConvertHit.cs" />
+    <Compile Include="Rulesets\Objects\Legacy\ConvertHitObjectParser.cs" />
+    <Compile Include="Rulesets\Objects\Legacy\ConvertHold.cs" />
+    <Compile Include="Rulesets\Objects\Legacy\Osu\ConvertSlider.cs" />
+    <Compile Include="Rulesets\Objects\Legacy\Osu\ConvertSpinner.cs" />
+    <Compile Include="Rulesets\Objects\SliderCurve.cs" />
+    <Compile Include="Rulesets\Objects\Types\CurveType.cs" />
+    <Compile Include="Rulesets\Objects\Drawables\IDrawableHitObjectWithProxiedApproach.cs" />
+    <Compile Include="Rulesets\Judgements\Judgement.cs" />
+    <Compile Include="Rulesets\Objects\HitObjectParser.cs" />
+    <Compile Include="Rulesets\Objects\Types\IHasCombo.cs" />
+    <Compile Include="Rulesets\Objects\Types\IHasEndTime.cs" />
+    <Compile Include="Rulesets\Objects\Types\IHasDistance.cs" />
+    <Compile Include="Rulesets\Objects\Types\IHasCurve.cs" />
+    <Compile Include="Rulesets\Objects\Types\IHasRepeats.cs" />
+    <Compile Include="Rulesets\Objects\Types\IHasPosition.cs" />
+    <Compile Include="Rulesets\Objects\Types\IHasHold.cs" />
+    <Compile Include="Rulesets\Objects\Legacy\ConvertHitObjectType.cs" />
+    <Compile Include="Rulesets\Replays\ReplayButtonState.cs" />
+    <Compile Include="Rulesets\Replays\ReplayFrame.cs" />
+    <Compile Include="Database\RulesetDatabase.cs" />
+    <Compile Include="Rulesets\Scoring\Score.cs" />
+    <Compile Include="Rulesets\Scoring\ScoreProcessor.cs" />
+    <Compile Include="Rulesets\UI\HealthDisplay.cs" />
+    <Compile Include="Rulesets\UI\HudOverlay.cs" />
+    <Compile Include="Rulesets\UI\StandardHealthDisplay.cs" />
+    <Compile Include="Rulesets\UI\StandardHudOverlay.cs" />
+    <Compile Include="Online\API\IOnlineComponent.cs" />
+    <Compile Include="Online\API\Requests\GetScoresRequest.cs" />
+    <Compile Include="Online\API\Requests\GetUserRequest.cs" />
+    <Compile Include="Overlays\DragBar.cs" />
+    <Compile Include="Overlays\LoginOverlay.cs" />
+    <Compile Include="Overlays\MusicController.cs" />
+    <Compile Include="Beatmaps\Beatmap.cs" />
+    <Compile Include="Beatmaps\WorkingBeatmap.cs" />
+    <Compile Include="Beatmaps\Drawables\BeatmapSetHeader.cs" />
+    <Compile Include="Beatmaps\Drawables\DifficultyIcon.cs" />
+    <Compile Include="Beatmaps\Drawables\Panel.cs" />
+    <Compile Include="Rulesets\Objects\Drawables\DrawableHitObject.cs" />
+    <Compile Include="Rulesets\Objects\HitObject.cs" />
+    <Compile Include="Beatmaps\Timing\ControlPoint.cs" />
+    <Compile Include="Configuration\OsuConfigManager.cs" />
+    <Compile Include="Overlays\Notifications\IHasCompletionTarget.cs" />
+    <Compile Include="Overlays\Notifications\Notification.cs" />
+    <Compile Include="Overlays\NotificationManager.cs" />
+    <Compile Include="Overlays\Notifications\NotificationSection.cs" />
+    <Compile Include="Overlays\Notifications\ProgressCompletionNotification.cs" />
+    <Compile Include="Overlays\Notifications\ProgressNotification.cs" />
+    <Compile Include="Overlays\Notifications\SimpleNotification.cs" />
+    <Compile Include="Overlays\Options\OptionDropdown.cs" />
+    <Compile Include="Overlays\Options\OptionLabel.cs" />
+    <Compile Include="Graphics\UserInterface\OsuDropdown.cs" />
+    <Compile Include="Overlays\Options\OptionsFooter.cs" />
+    <Compile Include="Overlays\Options\Sections\DebugSection.cs" />
+    <Compile Include="Overlays\Options\Sections\Debug\GeneralOptions.cs" />
+    <Compile Include="Overlays\Options\Sections\Debug\GCOptions.cs" />
+    <Compile Include="Overlays\Toolbar\ToolbarHomeButton.cs" />
+    <Compile Include="Overlays\Toolbar\ToolbarMusicButton.cs" />
+    <Compile Include="Overlays\Toolbar\ToolbarNotificationButton.cs" />
+    <Compile Include="Overlays\Toolbar\ToolbarSettingsButton.cs" />
+    <Compile Include="Overlays\Toolbar\ToolbarOverlayToggleButton.cs" />
+    <Compile Include="Overlays\Toolbar\ToolbarUserArea.cs" />
+    <Compile Include="Overlays\Toolbar\ToolbarUserButton.cs" />
+    <Compile Include="Screens\BackgroundScreen.cs" />
+    <Compile Include="Screens\Backgrounds\BackgroundScreenBeatmap.cs" />
+    <Compile Include="Screens\Backgrounds\BackgroundScreenCustom.cs" />
+    <Compile Include="Screens\Backgrounds\BackgroundScreenDefault.cs" />
+    <Compile Include="Screens\Backgrounds\BackgroundScreenEmpty.cs" />
+    <Compile Include="Screens\Charts\ChartInfo.cs" />
+    <Compile Include="Screens\Edit\Editor.cs" />
+    <Compile Include="Screens\Play\HotkeyRetryOverlay.cs" />
+    <Compile Include="Screens\Play\SquareGraph.cs" />
+    <Compile Include="Screens\Ranking\ResultsPage.cs" />
+    <Compile Include="Screens\Ranking\ResultsPageRanking.cs" />
+    <Compile Include="Screens\Ranking\ResultsPageScore.cs" />
+    <Compile Include="Screens\ScreenWhiteBox.cs" />
+    <Compile Include="Screens\Loader.cs" />
+    <Compile Include="Screens\Menu\Button.cs" />
+    <Compile Include="Screens\Menu\Disclaimer.cs" />
+    <Compile Include="Screens\Menu\FlowContainerWithOrigin.cs" />
+    <Compile Include="Screens\Menu\Intro.cs" />
+    <Compile Include="Screens\Menu\ButtonSystem.cs" />
+    <Compile Include="Screens\Menu\MainMenu.cs" />
+    <Compile Include="Screens\Menu\MenuVisualisation.cs" />
+    <Compile Include="Screens\Menu\OsuLogo.cs" />
+    <Compile Include="Screens\Multiplayer\Lobby.cs" />
+    <Compile Include="Screens\Multiplayer\Match.cs" />
+    <Compile Include="Screens\Multiplayer\MatchCreate.cs" />
+    <Compile Include="Screens\Play\FailOverlay.cs" />
+    <Compile Include="Screens\Play\MenuOverlay.cs" />
+    <Compile Include="Screens\Play\KeyConversionInputManager.cs" />
+    <Compile Include="Screens\Play\PauseOverlay.cs" />
+    <Compile Include="Screens\Play\Pause\PauseButton.cs" />
+    <Compile Include="Screens\Play\PlayerInputManager.cs" />
+    <Compile Include="Screens\Play\PlayerLoader.cs" />
+    <Compile Include="Screens\Play\ReplayPlayer.cs" />
+    <Compile Include="Screens\Play\SkipButton.cs" />
+    <Compile Include="Rulesets\UI\StandardComboCounter.cs" />
+    <Compile Include="Screens\Ranking\AspectContainer.cs" />
+    <Compile Include="Screens\Ranking\ResultMode.cs" />
+    <Compile Include="Screens\Ranking\ResultModeButton.cs" />
+    <Compile Include="Screens\Ranking\ResultModeTabControl.cs" />
+    <Compile Include="Screens\Select\BeatmapCarousel.cs" />
+    <Compile Include="Screens\Select\BeatmapDetails.cs" />
+    <Compile Include="Graphics\UserInterface\BarGraph.cs" />
+    <Compile Include="Screens\Select\FilterCriteria.cs" />
+    <Compile Include="Screens\Select\Filter\GroupMode.cs" />
+    <Compile Include="Screens\Select\Filter\SortMode.cs" />
+    <Compile Include="Screens\Select\MatchSongSelect.cs" />
+    <Compile Include="Screens\OsuScreen.cs" />
+    <Compile Include="Beatmaps\Drawables\BeatmapGroup.cs" />
+    <Compile Include="Beatmaps\Drawables\BeatmapPanel.cs" />
+    <Compile Include="Screens\Play\Player.cs" />
+    <Compile Include="Screens\Charts\ChartListing.cs" />
+    <Compile Include="Rulesets\Ruleset.cs" />
+    <Compile Include="Screens\Ranking\Results.cs" />
+    <Compile Include="Screens\Direct\OnlineListing.cs" />
+    <Compile Include="Screens\Select\PlaySongSelect.cs" />
+    <Compile Include="Screens\Select\SongSelect.cs" />
+    <Compile Include="Rulesets\UI\HitRenderer.cs" />
+    <Compile Include="Rulesets\UI\Playfield.cs" />
+    <Compile Include="Screens\Select\EditSongSelect.cs" />
+    <Compile Include="Rulesets\UI\ComboCounter.cs" />
+    <Compile Include="Rulesets\UI\ComboResultCounter.cs" />
+    <Compile Include="Graphics\UserInterface\RollingCounter.cs" />
+    <Compile Include="Graphics\UserInterface\Volume\VolumeControlReceptor.cs" />
+    <Compile Include="Input\GlobalHotkeys.cs" />
+    <Compile Include="Graphics\Backgrounds\Background.cs" />
+    <Compile Include="Graphics\Containers\ParallaxContainer.cs" />
+    <Compile Include="Graphics\Cursor\MenuCursor.cs" />
+    <Compile Include="Graphics\Processing\RatioAdjust.cs" />
+    <Compile Include="Graphics\TextAwesome.cs" />
+    <Compile Include="Screens\Play\KeyCounter.cs" />
+    <Compile Include="Screens\Play\KeyCounterKeyboard.cs" />
+    <Compile Include="Screens\Play\KeyCounterCollection.cs" />
+    <Compile Include="Screens\Play\KeyCounterMouse.cs" />
+    <Compile Include="Graphics\UserInterface\PercentageCounter.cs" />
+    <Compile Include="Graphics\UserInterface\ScoreCounter.cs" />
+    <Compile Include="Graphics\UserInterface\StarCounter.cs" />
+    <Compile Include="IPC\BeatmapIPCChannel.cs" />
+    <Compile Include="Online\API\APIAccess.cs" />
+    <Compile Include="Online\API\APIRequest.cs" />
+    <Compile Include="Online\API\OAuth.cs" />
+    <Compile Include="Online\API\OAuthToken.cs" />
+    <Compile Include="Online\API\Requests\GetMessagesRequest.cs" />
+    <Compile Include="Online\API\Requests\ListChannelsRequest.cs" />
+    <Compile Include="Online\Chat\Channel.cs" />
+    <Compile Include="Online\Chat\Drawables\DrawableChannel.cs" />
+    <Compile Include="Online\Chat\Drawables\ChatLine.cs" />
+    <Compile Include="Online\Chat\Message.cs" />
+    <Compile Include="OsuGame.cs" />
+    <Compile Include="OsuGameBase.cs" />
+    <Compile Include="Overlays\ChatOverlay.cs" />
+    <Compile Include="Overlays\OptionsOverlay.cs" />
+    <Compile Include="Overlays\Toolbar\Toolbar.cs" />
+    <Compile Include="Overlays\Toolbar\ToolbarButton.cs" />
+    <Compile Include="Overlays\Toolbar\ToolbarModeButton.cs" />
+    <Compile Include="Overlays\Toolbar\ToolbarModeSelector.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Screens\Select\BeatmapInfoWedge.cs" />
+    <Compile Include="Screens\Select\WedgeBackground.cs" />
+    <Compile Include="Screens\Tournament\Components\DrawingsConfigManager.cs" />
+    <Compile Include="Screens\Tournament\Components\VisualiserContainer.cs" />
+    <Compile Include="Screens\Tournament\Drawings.cs" />
+    <Compile Include="Screens\Tournament\Group.cs" />
+    <Compile Include="Screens\Tournament\GroupContainer.cs" />
+    <Compile Include="Screens\Tournament\Teams\ITeamList.cs" />
+    <Compile Include="Screens\Tournament\ScrollingTeamContainer.cs" />
+    <Compile Include="Screens\Tournament\Teams\StorageBackedTeamList.cs" />
+    <Compile Include="Users\UpdateableAvatar.cs" />
+    <Compile Include="Users\User.cs" />
+    <Compile Include="Graphics\UserInterface\Volume\VolumeControl.cs" />
+    <Compile Include="Database\BeatmapDatabase.cs" />
+    <Compile Include="Beatmaps\IO\ArchiveReader.cs" />
+    <Compile Include="Beatmaps\Formats\BeatmapDecoder.cs" />
+    <Compile Include="Beatmaps\Formats\OsuLegacyDecoder.cs" />
+    <Compile Include="Beatmaps\IO\OszArchiveReader.cs" />
+    <Compile Include="Beatmaps\Events\EventType.cs" />
+    <Compile Include="Graphics\UserInterface\Volume\VolumeMeter.cs" />
+    <Compile Include="Database\BeatmapSetInfo.cs" />
+    <Compile Include="Database\BeatmapMetadata.cs" />
+    <Compile Include="Database\BeatmapInfo.cs" />
+    <Compile Include="Database\BeatmapDifficulty.cs" />
+    <Compile Include="Database\DatabaseWorkingBeatmap.cs" />
+    <Compile Include="Graphics\UserInterface\OsuButton.cs" />
+    <Compile Include="Overlays\Options\Sections\MaintenanceSection.cs" />
+    <Compile Include="Overlays\Options\OptionsSection.cs" />
+    <Compile Include="Overlays\Options\OptionsSubsection.cs" />
+    <Compile Include="Graphics\UserInterface\LoadingAnimation.cs" />
+    <Compile Include="Overlays\Options\Sidebar.cs" />
+    <Compile Include="Overlays\Options\Sections\GeneralSection.cs" />
+    <Compile Include="Overlays\Options\Sections\General\LoginOptions.cs" />
+    <Compile Include="Overlays\Options\Sections\General\UpdateOptions.cs" />
+    <Compile Include="Overlays\Options\Sections\General\LanguageOptions.cs" />
+    <Compile Include="Overlays\Options\Sections\GraphicsSection.cs" />
+    <Compile Include="Overlays\Options\Sections\Graphics\RendererOptions.cs" />
+    <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" />
+    <Compile Include="Overlays\Options\Sections\AudioSection.cs" />
+    <Compile Include="Overlays\Options\Sections\Audio\AudioDevicesOptions.cs" />
+    <Compile Include="Overlays\Options\Sections\Audio\VolumeOptions.cs" />
+    <Compile Include="Overlays\Options\Sections\Audio\OffsetOptions.cs" />
+    <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" />
+    <Compile Include="Screens\Select\FooterButton.cs" />
+    <Compile Include="Screens\Select\Footer.cs" />
+    <Compile Include="Screens\Play\SongProgress.cs" />
+    <Compile Include="Screens\Play\SongProgressGraph.cs" />
+    <Compile Include="Screens\Play\SongProgressBar.cs" />
+    <Compile Include="Screens\Play\Pause\PauseProgressBar.cs" />
+    <Compile Include="Screens\Play\Pause\PauseProgressGraph.cs" />
+    <Compile Include="Overlays\Mods\ModSelectOverlay.cs" />
+    <Compile Include="Rulesets\Mods\Mod.cs" />
+    <Compile Include="Overlays\Mods\ModButton.cs" />
+    <Compile Include="Rulesets\UI\ModIcon.cs" />
+    <Compile Include="Overlays\Mods\ModSection.cs" />
+    <Compile Include="Overlays\Mods\DifficultyReductionSection.cs" />
+    <Compile Include="Overlays\Mods\DifficultyIncreaseSection.cs" />
+    <Compile Include="Overlays\Dialog\PopupDialog.cs" />
+    <Compile Include="Graphics\UserInterface\DialogButton.cs" />
+    <Compile Include="Overlays\Dialog\PopupDialogButton.cs" />
+    <Compile Include="Overlays\Dialog\PopupDialogOkButton.cs" />
+    <Compile Include="Overlays\Dialog\PopupDialogCancelButton.cs" />
+    <Compile Include="Screens\Select\BeatmapDeleteDialog.cs" />
+    <Compile Include="Overlays\DialogOverlay.cs" />
+    <Compile Include="Overlays\Mods\AssistedSection.cs" />
+    <Compile Include="Overlays\WaveOverlayContainer.cs" />
+    <Compile Include="Screens\Select\Options\BeatmapOptionsButton.cs" />
+    <Compile Include="Screens\Select\Options\BeatmapOptionsOverlay.cs" />
+    <Compile Include="Screens\Select\Leaderboards\Leaderboard.cs" />
+    <Compile Include="Screens\Select\Leaderboards\LeaderboardScore.cs" />
+    <Compile Include="Users\Country.cs" />
+    <Compile Include="Users\Team.cs" />
+    <Compile Include="Rulesets\Scoring\ScoreRank.cs" />
+    <Compile Include="Users\Avatar.cs" />
+    <Compile Include="Screens\Select\Leaderboards\DrawableRank.cs" />
+    <Compile Include="Graphics\UserInterface\OsuTabControl.cs" />
+    <Compile Include="Screens\Select\BeatmapDetailArea.cs" />
+    <Compile Include="Graphics\UserInterface\OsuTabControlCheckbox.cs" />
+    <Compile Include="Screens\Select\BeatmapDetailAreaTabControl.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(SolutionDir)\osu-framework\osu.Framework\osu.Framework.csproj">
+      <Project>{c76bf5b3-985e-4d39-95fe-97c9c879b83a}</Project>
+      <Name>osu.Framework</Name>
+    </ProjectReference>
+    <ProjectReference Include="$(SolutionDir)\osu-resources\osu.Game.Resources\osu.Game.Resources.csproj">
+      <Project>{d9a367c9-4c1a-489f-9b05-a0cea2b53b58}</Project>
+      <Name>osu.Game.Resources</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\osu.licenseheader">
+      <Link>osu.licenseheader</Link>
+    </None>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup />
+  <ItemGroup />
+  <ItemGroup />
+  <ItemGroup />
+  <ItemGroup />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
 </Project>