Merge branch 'master' into hit-samples

# Conflicts:
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs

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

@@ -13,7 +13,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
 {
     public class DrawableHitCircle : DrawableOsuHitObject
     {
-        private OsuHitObject osuObject;
+        private HitCircle osuObject;
 
         public ApproachCircle ApproachCircle;
         private CirclePiece circle;
@@ -23,12 +23,13 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
         private NumberPiece number;
         private GlowPiece glow;
 
-        public DrawableHitCircle(OsuHitObject h) : base(h)
+        public DrawableHitCircle(HitCircle h) : base(h)
         {
             osuObject = h;
 
             Origin = Anchor.Centre;
             Position = osuObject.Position;
+            Scale = new Vector2(osuObject.Scale);
 
             Children = new Drawable[]
             {
@@ -104,7 +105,6 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
             ApproachCircle.Alpha = 0;
             ApproachCircle.Scale = new Vector2(2);
             explode.Alpha = 0;
-            Scale = new Vector2(0.5f); //this will probably need to be moved to DrawableHitObject at some point.
         }
 
         protected override void UpdatePreemptState()

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

@@ -1,12 +1,7 @@
 //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
 //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using osu.Game.Modes.Objects;
 using osu.Game.Modes.Objects.Drawables;
 

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

@@ -27,27 +27,35 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
         {
             slider = s;
 
-            Origin = Anchor.TopLeft;
-            Position = Vector2.Zero;
-            RelativeSizeAxes = Axes.Both;
-
             Children = new Drawable[]
             {
                 body = new SliderBody(s)
                 {
                     Position = s.Position,
-                    PathWidth = 36,
+                    PathWidth = s.Scale * 72,
+                },
+                bouncer1 = new SliderBouncer(s, false)
+                {
+                    Position = s.Curve.PositionAt(1),
+                    Scale = new Vector2(s.Scale),
+                },
+                bouncer2 = new SliderBouncer(s, true)
+                {
+                    Position = s.Position,
+                    Scale = new Vector2(s.Scale),
+                },
+                ball = new SliderBall(s)
+                {
+                    Scale = new Vector2(s.Scale),
                 },
-                bouncer1 = new SliderBouncer(slider, false) { Position = slider.Curve.PositionAt(1) },
-                bouncer2 = new SliderBouncer(slider, true) { Position = slider.Position },
                 initialCircle = new DrawableHitCircle(new HitCircle
                 {
                     StartTime = s.StartTime,
                     Position = s.Position,
+                    Scale = s.Scale,
                     Colour = s.Colour,
                     Sample = s.Sample,
                 }),
-                ball = new SliderBall(slider),
             };
 
             components.Add(body);
@@ -56,6 +64,10 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
             components.Add(bouncer2);
         }
 
+        // Since the DrawableSlider itself is just a container without a size we need to
+        // pass all input through.
+        public override bool Contains(Vector2 screenSpacePos) => true;
+
         int currentRepeat;
 
         protected override void Update()

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

@@ -58,7 +58,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
                 ScaleTo(1.6f);
                 ScaleTo(1, 100, EasingTypes.In);
 
-                MoveToRelative(new Vector2(0, 100), 800, EasingTypes.InQuint);
+                MoveToOffset(new Vector2(0, 100), 800, EasingTypes.InQuint);
                 RotateTo(40, 800, EasingTypes.InQuint);
 
                 Delay(600);

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

@@ -16,7 +16,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
         private readonly Slider slider;
         private Box follow;
 
-        const float width = 70;
+        const float width = 140;
 
         public SliderBall(Slider slider)
         {
@@ -25,7 +25,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
             AutoSizeAxes = Axes.Both;
             BlendingMode = BlendingMode.Additive;
             Origin = Anchor.Centre;
-            BorderThickness = 5;
+            BorderThickness = 10;
             BorderColour = Color4.Orange;
 
             Children = new Drawable[]
@@ -45,7 +45,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
                     AutoSizeAxes = Axes.Both,
                     Origin = Anchor.Centre,
                     Anchor = Anchor.Centre,
-                    BorderThickness = 7,
+                    BorderThickness = 14,
                     BorderColour = Color4.White,
                     Alpha = 1,
                     CornerRadius = width / 2,

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

@@ -35,7 +35,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
                     Icon = FontAwesome.fa_eercast,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    TextSize = 24,
+                    TextSize = 48,
                 }
             };
         }