Merge branch 'master' of git://github.com/ppy/osu into details

osu-framework

@@ -1 +1 @@
-Subproject commit 4d131fd0d997bee313de3fa33a45900637570ff0
+Subproject commit 269a1fd192c573d558a5ab0ff990a8b462947287

osu.Game/Beatmaps/Drawables/BeatmapSetHeader.cs

@@ -36,7 +36,8 @@ namespace osu.Game.Beatmaps.Drawables
                 new DelayedLoadContainer
                 {
                     RelativeSizeAxes = Axes.Both,
-                    TimeBeforeLoad = 100,
+                    TimeBeforeLoad = 300,
+                    FinishedLoading = d => d.FadeInFromZero(400, EasingTypes.Out),
                     Children = new[]
                     {
                         new PanelBackground(beatmap)

osu.Game/Modes/Scoring/ScoreProcessor.cs

@@ -152,6 +152,8 @@ namespace osu.Game.Modes.Scoring
 
         protected override void Reset()
         {
+            base.Reset();
+
             Judgements.Clear();
         }
 

osu.Game/OsuGame.cs

@@ -199,7 +199,7 @@ namespace osu.Game
             {
                 Depth = -3,
                 OnHome = delegate { intro?.ChildScreen?.MakeCurrent(); },
-                OnPlayModeChange = delegate (PlayMode m) { PlayMode.Value = m; },
+                OnPlayModeChange = m => PlayMode.Value = m,
             }).LoadAsync(this, t =>
             {
                 PlayMode.ValueChanged += delegate { Toolbar.SetGameMode(PlayMode.Value); };

osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs

@@ -65,14 +65,13 @@ namespace osu.Game.Overlays.Toolbar
 
             foreach (PlayMode m in Ruleset.PlayModes)
             {
-                var localMode = m;
                 modeButtons.Add(new ToolbarModeButton
                 {
                     Mode = m,
                     Action = delegate
                     {
-                        SetGameMode(localMode);
-                        OnPlayModeChange?.Invoke(localMode);
+                        SetGameMode(m);
+                        OnPlayModeChange?.Invoke(m);
                     }
                 });
             }

osu.Game/Screens/Select/BeatmapCarousel.cs

@@ -181,7 +181,8 @@ namespace osu.Game.Screens.Select
         {
             if (!IsLoaded) return;
 
-            criteria = newCriteria ?? criteria ?? new FilterCriteria();
+            if (newCriteria != null)
+                criteria = newCriteria;
 
             Action perform = delegate
             {
@@ -202,6 +203,8 @@ namespace osu.Game.Screens.Select
 
                 if (selectedGroup == null || selectedGroup.State == BeatmapGroupState.Hidden)
                     SelectNext();
+                else
+                    selectGroup(selectedGroup);
             };
 
             filterTask?.Cancel();

osu.Game/Screens/Select/FilterControl.cs

@@ -175,6 +175,7 @@ namespace osu.Game.Screens.Select
 
             if (osu != null)
                 playMode.BindTo(osu.PlayMode);
+            playMode.ValueChanged += (s, e) => FilterChanged?.Invoke(CreateCriteria());
         }
 
         protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) => true;

osu.Game/Screens/Select/SongSelect.cs

@@ -276,7 +276,7 @@ namespace osu.Game.Screens.Select
             initialAddSetsTask.Cancel();
         }
 
-        private void playMode_ValueChanged(object sender, EventArgs e) => carousel.Filter();
+        private void playMode_ValueChanged(object sender, EventArgs e) => Beatmap.PreferredPlayMode = playMode;
 
         private void changeBackground(WorkingBeatmap beatmap)
         {

osu.Game/Screens/Tournament/ScrollingTeamContainer.cs

@@ -298,9 +298,7 @@ namespace osu.Game.Screens.Tournament
         private void speedTo(float value, double duration = 0, EasingTypes easing = EasingTypes.None)
         {
             DelayReset();
-
-            UpdateTransformsOfType(typeof(TransformScrollSpeed));
-            TransformFloatTo(speed, value, duration, easing, new TransformScrollSpeed());
+            TransformTo(speed, value, duration, easing, new TransformScrollSpeed());
         }
 
         private enum ScrollState