Merge branch 'master' into direct-show-deleted-sets

osu-framework

@@ -1 +1 @@
-Subproject commit 8f36ddab946ff538620081ede7719461d4732b79
+Subproject commit 26c01ca6069296621f76d8ffbfe31ecf8074c687

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

@@ -60,7 +60,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     Samples = s.Samples,
                     SampleControlPoint = s.SampleControlPoint,
                     TimePreempt = s.TimePreempt,
-                    TimeFadein = s.TimeFadein
+                    TimeFadein = s.TimeFadein,
+                    HitWindow300 = s.HitWindow300,
+                    HitWindow100 = s.HitWindow100,
+                    HitWindow50 = s.HitWindow50
                 })
             };
 

osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs

@@ -16,9 +16,9 @@ namespace osu.Game.Rulesets.Osu.Objects
         public const double OBJECT_RADIUS = 64;
 
         private const double hittable_range = 300;
-        private const double hit_window_50 = 150;
+        public double HitWindow50 = 150;
-        private const double hit_window_100 = 80;
+        public double HitWindow100 = 80;
-        private const double hit_window_300 = 30;
+        public double HitWindow300 = 30;
 
         public float TimePreempt = 600;
         public float TimeFadein = 400;
@@ -50,13 +50,13 @@ namespace osu.Game.Rulesets.Osu.Objects
             switch (result)
             {
                 default:
-                    return 300;
+                    return hittable_range;
                 case HitResult.Meh:
-                    return 150;
+                    return HitWindow50;
                 case HitResult.Good:
-                    return 80;
+                    return HitWindow100;
                 case HitResult.Great:
-                    return 30;
+                    return HitWindow300;
             }
         }
 
@@ -78,6 +78,10 @@ namespace osu.Game.Rulesets.Osu.Objects
             TimePreempt = (float)BeatmapDifficulty.DifficultyRange(difficulty.ApproachRate, 1800, 1200, 450);
             TimeFadein = (float)BeatmapDifficulty.DifficultyRange(difficulty.ApproachRate, 1200, 800, 300);
 
+            HitWindow50 = BeatmapDifficulty.DifficultyRange(difficulty.OverallDifficulty, 200, 150, 100);
+            HitWindow100 = BeatmapDifficulty.DifficultyRange(difficulty.OverallDifficulty, 140, 100, 60);
+            HitWindow300 = BeatmapDifficulty.DifficultyRange(difficulty.OverallDifficulty, 80, 50, 20);
+
             Scale = (1.0f - 0.7f * (difficulty.CircleSize - 5) / 5) / 2;
         }
     }

osu.Game.Tests/Visual/TestCaseWaveform.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using NUnit.Framework;
 using OpenTK;
 using OpenTK.Graphics;
 using osu.Framework.Allocation;
@@ -15,6 +16,7 @@ using osu.Game.Screens.Edit.Screens.Compose.Timeline;
 
 namespace osu.Game.Tests.Visual
 {
+    [Ignore("CI regularly hangs on this TestCase...")]
     public class TestCaseWaveform : OsuTestCase
     {
         private readonly Bindable<WorkingBeatmap> beatmapBacking = new Bindable<WorkingBeatmap>();

osu.Game/Beatmaps/BeatmapManager.cs

@@ -287,9 +287,8 @@ namespace osu.Game.Beatmaps
                         Import(archive);
 
                     downloadNotification.State = ProgressNotificationState.Completed;
+                    currentDownloads.Remove(request);
                 }, TaskCreationOptions.LongRunning);
-
-                currentDownloads.Remove(request);
             };
 
             request.Failure += data =>

osu.Game/Graphics/UserInterface/ProgressBar.cs

@@ -18,7 +18,7 @@ namespace osu.Game.Graphics.UserInterface
 
         public Color4 FillColour
         {
-            set { fill.Colour = value; }
+            set { fill.FadeColour(value, 150, Easing.OutQuint); }
         }
 
         public Color4 BackgroundColour

osu.Game/Overlays/Direct/DirectPanel.cs

@@ -65,11 +65,14 @@ namespace osu.Game.Overlays.Direct
             Colour = Color4.Black.Opacity(0.3f),
         };
 
+        private OsuColour colours;
+
         [BackgroundDependencyLoader(permitNulls: true)]
         private void load(BeatmapManager beatmaps, OsuColour colours, BeatmapSetOverlay beatmapSetOverlay)
         {
             this.beatmaps = beatmaps;
             this.beatmapSetOverlay = beatmapSetOverlay;
+            this.colours = colours;
 
             AddInternal(content = new Container
             {
@@ -106,6 +109,8 @@ namespace osu.Game.Overlays.Direct
             beatmaps.BeatmapDownloadBegan += attachDownload;
         }
 
+        public override bool DisposeOnDeathRemoval => true;
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
@@ -188,7 +193,7 @@ namespace osu.Game.Overlays.Direct
             request.Success += data =>
             {
                 progressBar.Current.Value = 1;
-                progressBar.FadeOut(500);
+                progressBar.FillColour = colours.Yellow;
             };
         }
 

osu.Game/Overlays/Direct/PlayButton.cs

@@ -145,6 +145,12 @@ namespace osu.Game.Overlays.Direct
             }
         }
 
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            Playing.Value = false;
+        }
+
         private TrackLoader trackLoader;
         private AudioManager audio;