Merge branch 'master' into skip-button

# Conflicts:
#	osu.Game/Graphics/UserInterface/BackButton.cs
#	osu.Game/Screens/Play/Player.cs
#	osu.Game/osu.Game.csproj

osu.Game/Screens/Play/Player.cs

@@ -16,11 +16,13 @@ using osu.Framework.GameModes;
 using osu.Game.Modes.UI;
 using osu.Game.Screens.Ranking;
 using osu.Game.Configuration;
+using osu.Game.Overlays.Pause;
 using osu.Framework.Configuration;
 using System;
 using System.Linq;
 using osu.Game.Beatmaps;
 using OpenTK.Graphics;
+using osu.Framework.Graphics.Containers;
 
 namespace osu.Game.Screens.Play
 {
@@ -35,7 +37,23 @@ namespace osu.Game.Screens.Play
         public BeatmapInfo BeatmapInfo;
 
         public PlayMode PreferredPlayMode;
-        
+
+        private bool isPaused;
+        public bool IsPaused
+        {
+            get
+            {
+                return isPaused;
+            }
+        }
+
+        public int RestartCount;
+
+        private double pauseCooldown = 1000;
+        private double lastPauseActionTime = 0;
+
+        private bool canPause => Time.Current >= (lastPauseActionTime + pauseCooldown);
+
         private IAdjustableClock sourceClock;
 
         private Ruleset ruleset;
@@ -45,6 +63,10 @@ namespace osu.Game.Screens.Play
         private Bindable<int> dimLevel;
         private SkipButton skipButton;
 
+        private ScoreOverlay scoreOverlay;
+        private PauseOverlay pauseOverlay;
+        private PlayerInputManager playerInputManager;
+
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, BeatmapDatabase beatmaps, OsuGameBase game, OsuConfigManager config)
         {
@@ -89,9 +111,20 @@ namespace osu.Game.Screens.Play
 
             ruleset = Ruleset.GetRuleset(usablePlayMode);
 
-            var scoreOverlay = ruleset.CreateScoreOverlay();
+            scoreOverlay = ruleset.CreateScoreOverlay();
             scoreOverlay.BindProcessor(scoreProcessor = ruleset.CreateScoreProcessor(beatmap.HitObjects.Count));
 
+            pauseOverlay = new PauseOverlay
+            {
+                Depth = -1,
+                OnResume = delegate {
+                    Delay(400);
+                    Schedule(Resume);
+                },
+                OnRetry = Restart,
+                OnQuit = Exit
+            };
+
             hitRenderer = ruleset.CreateHitRendererWith(beatmap.HitObjects);
 
             //bind HitRenderer to ScoreProcessor and ourselves (for a pass situation)
@@ -106,7 +139,7 @@ namespace osu.Game.Screens.Play
 
             Children = new Drawable[]
             {
-                new PlayerInputManager(game.Host)
+                playerInputManager = new PlayerInputManager(game.Host)
                 {
                     Clock = new InterpolatingFramedClock(sourceClock),
                     PassThrough = false,
@@ -117,6 +150,7 @@ namespace osu.Game.Screens.Play
                     }
                 },
                 scoreOverlay,
+                pauseOverlay
             };
         }
 
@@ -147,6 +181,58 @@ namespace osu.Game.Screens.Play
             skipButton.Expire();
         }
 
+        public void Pause(bool force = false)
+        {
+            if (canPause || force)
+            {
+                lastPauseActionTime = Time.Current;
+                playerInputManager.PassThrough = true;
+                scoreOverlay.KeyCounter.IsCounting = false;
+                pauseOverlay.Retries = RestartCount;
+                pauseOverlay.Show();
+                sourceClock.Stop();
+                isPaused = true;
+            }
+            else
+            {
+                isPaused = false;
+            }
+        }
+
+        public void Resume()
+        {
+            lastPauseActionTime = Time.Current;
+            playerInputManager.PassThrough = false;
+            scoreOverlay.KeyCounter.IsCounting = true;
+            pauseOverlay.Hide();
+            sourceClock.Start();
+            isPaused = false;
+        }
+
+        public void TogglePaused()
+        {
+            isPaused = !IsPaused;
+            if (IsPaused) Pause(); else Resume();
+        }
+
+        public void Restart()
+        {
+            sourceClock.Stop(); // If the clock is running and Restart is called the game will lag until relaunch
+
+            var newPlayer = new Player();
+
+            newPlayer.Preload(Game, delegate
+            {
+                newPlayer.RestartCount = RestartCount + 1;
+                ValidForResume = false;
+
+                if (!Push(newPlayer))
+                {
+                    // Error(?)
+                }
+            });
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -202,9 +288,19 @@ namespace osu.Game.Screens.Play
 
         protected override bool OnExiting(GameMode next)
         {
-            dimLevel.ValueChanged -= dimChanged;
-            Background?.FadeTo(1f, 200);
-            return base.OnExiting(next);
+            if (pauseOverlay.State != Visibility.Visible && !canPause) return true;
+
+            if (!IsPaused && sourceClock.IsRunning) // For if the user presses escape quickly when entering the map
+            {
+                Pause();
+                return true;
+            }
+            else
+            {
+                dimLevel.ValueChanged -= dimChanged;
+                Background?.FadeTo(1f, 200);
+                return base.OnExiting(next);
+            }
         }
 
         private void dimChanged(object sender, EventArgs e)