Merge branch 'master' into editor-keyboard-seek

osu.Game/Screens/Edit/Components/PlaybackControl.cs

@@ -13,6 +13,7 @@ using osu.Framework.Timing;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
+using osuTK.Input;
 
 namespace osu.Game.Screens.Edit.Components
 {
@@ -63,6 +64,18 @@ namespace osu.Game.Screens.Edit.Components
             tabs.Current.ValueChanged += newValue => Beatmap.Value.Track.Tempo.Value = newValue;
         }
 
+        protected override bool OnKeyDown(KeyDownEvent e)
+        {
+            switch (e.Key)
+            {
+                case Key.Space:
+                    togglePause();
+                    return true;
+            }
+
+            return base.OnKeyDown(e);
+        }
+
         private void togglePause()
         {
             if (adjustableClock.IsRunning)