Merge pull request #382 from peppy/general-fixes

General fixes

osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs

@@ -120,12 +120,15 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
         {
             base.UpdatePreemptState();
 
-            FadeIn(200);
             circleContainer.ScaleTo(1, 400, EasingTypes.OutElastic);
 
-            background.Delay(TIME_PREEMPT - 100);
+            background.Delay(TIME_PREEMPT - 500);
+
+            background.ScaleTo(scaleToCircle * 1.2f, 400, EasingTypes.OutQuint);
             background.FadeIn(200);
-            background.ScaleTo(1, 200, EasingTypes.OutQuint);
+
+            background.Delay(400);
+            background.ScaleTo(1, 250, EasingTypes.OutQuint);
 
             disc.Delay(TIME_PREEMPT - 50);
             disc.FadeIn(200);

osu.Game.Modes.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs

@@ -173,7 +173,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
 
         private int completeTick;
 
-        private bool updateCompleteTick() => completeTick != (completeTick = (int)(RotationAbsolute / 720));
+        private bool updateCompleteTick() => completeTick != (completeTick = (int)(RotationAbsolute / 360));
 
         protected override void Update()
         {

osu.Game/Beatmaps/Drawables/Panel.cs

@@ -38,6 +38,8 @@ namespace osu.Game.Beatmaps.Drawables
                 CornerRadius = 10,
                 BorderColour = new Color4(221, 255, 255, 255),
             });
+
+            Alpha = 0;
         }
 
         public void SetMultiplicativeAlpha(float alpha)

osu.Game/Screens/Play/SkipButton.cs

@@ -4,8 +4,10 @@
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Graphics;
+using osu.Framework.Input;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
+using OpenTK.Input;
 
 namespace osu.Game.Screens.Play
 {
@@ -28,5 +30,19 @@ namespace osu.Game.Screens.Play
             Colour = colours.Yellow;
             HoverColour = colours.YellowDark;
         }
+
+        protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
+        {
+            if (args.Repeat) return false;
+
+            switch (args.Key)
+            {
+                case Key.Space:
+                    TriggerClick();
+                    return true;
+            }
+
+            return base.OnKeyDown(state, args);
+        }
     }
 }