Merge remote-tracking branch 'upstream/master' into profile

osu-framework

@@ -1 +1 @@
-Subproject commit 2f7ebfcf637cc1928d8d37f6336e5da77f4926a0
+Subproject commit 02a1dc592b47cd569ba87b9f4a50f7f8677636d6

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

@@ -125,7 +125,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             if (!userTriggered && Time.Current >= slider.EndTime)
             {
-                var ticksCount = ticks.Children.Count() + 1;
+                var ticksCount = ticks.Children.Count + 1;
                 var ticksHit = ticks.Children.Count(t => t.Judgement.Result == HitResult.Hit);
                 if (initialCircle.Judgement.Result == HitResult.Hit)
                     ticksHit++;

osu.Game/Graphics/UserInterface/BarGraph.cs

@@ -29,7 +29,7 @@ namespace osu.Game.Graphics.UserInterface
                 base.Direction = (direction & BarDirection.Horizontal) > 0 ? FillDirection.Vertical : FillDirection.Horizontal;
                 foreach (var bar in Children)
                 {
-                    bar.Size = (direction & BarDirection.Horizontal) > 0 ? new Vector2(1, 1.0f / Children.Count()) : new Vector2(1.0f / Children.Count(), 1);
+                    bar.Size = (direction & BarDirection.Horizontal) > 0 ? new Vector2(1, 1.0f / Children.Count) : new Vector2(1.0f / Children.Count, 1);
                     bar.Direction = direction;
                 }
             }

osu.Game/Overlays/Chat/ChannelSection.cs

@@ -35,7 +35,7 @@ namespace osu.Game.Overlays.Chat
 
         public IEnumerable<Channel> Channels
         {
-            set { ChannelFlow.Children = value.Select(c => new ChannelListItem(c)); }
+            set { ChannelFlow.ChildrenEnumerable = value.Select(c => new ChannelListItem(c)); }
         }
 
         public ChannelSection()

osu.Game/Overlays/Chat/ChannelSelectionOverlay.cs

@@ -38,7 +38,7 @@ namespace osu.Game.Overlays.Chat
         {
             set
             {
-                sectionsFlow.Children = value;
+                sectionsFlow.ChildrenEnumerable = value;
 
                 foreach (ChannelSection s in sectionsFlow.Children)
                 {

osu.Game/Overlays/Dialog/PopupDialog.cs

@@ -56,7 +56,7 @@ namespace osu.Game.Overlays.Dialog
             get { return buttonsContainer.Children; }
             set
             {
-                buttonsContainer.Children = value;
+                buttonsContainer.ChildrenEnumerable = value;
                 foreach (PopupDialogButton b in value)
                 {
                     var action = b.Action;

osu.Game/Overlays/Direct/DirectPanel.cs

@@ -24,7 +24,7 @@ namespace osu.Game.Overlays.Direct
             SetInfo = setInfo;
         }
 
-        protected IEnumerable<DifficultyIcon> GetDifficultyIcons()
+        protected List<DifficultyIcon> GetDifficultyIcons()
         {
             var icons = new List<DifficultyIcon>();
 

osu.Game/Overlays/DirectOverlay.cs

@@ -129,7 +129,7 @@ namespace osu.Game.Overlays
         private void recreatePanels(PanelDisplayStyle displayStyle)
         {
             if (BeatmapSets == null) return;
-            panels.Children = BeatmapSets.Select(b => displayStyle == PanelDisplayStyle.Grid ? (DirectPanel)new DirectGridPanel(b) { Width = 400 } : new DirectListPanel(b));
+            panels.ChildrenEnumerable = BeatmapSets.Select(b => displayStyle == PanelDisplayStyle.Grid ? (DirectPanel)new DirectGridPanel(b) { Width = 400 } : new DirectListPanel(b));
         }
 
         public class ResultCounts

osu.Game/Overlays/OnScreenDisplay.cs

@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Configuration;
 using osu.Framework.Extensions;
@@ -182,7 +181,7 @@ namespace osu.Game.Overlays
                 textLine2.Origin = optionCount > 0 ? Anchor.BottomCentre : Anchor.Centre;
                 textLine2.Y = optionCount > 0 ? 0 : 5;
 
-                if (optionLights.Children.Count() != optionCount)
+                if (optionLights.Children.Count != optionCount)
                 {
                     optionLights.Clear();
                     for (int i = 0; i < optionCount; i++)
@@ -190,7 +189,7 @@ namespace osu.Game.Overlays
                 }
 
                 for (int i = 0; i < optionCount; i++)
-                    optionLights.Children.Skip(i).First().Glowing = i == selectedOption;
+                    optionLights.Children[i].Glowing = i == selectedOption;
             });
         }
 

osu.Game/Overlays/SocialOverlay.cs

@@ -44,7 +44,7 @@ namespace osu.Game.Overlays
                     panelFlow.Clear();
                 else
                 {
-                    panelFlow.Children = users.Select(u =>
+                    panelFlow.ChildrenEnumerable = users.Select(u =>
                     {
                         var p = new UserPanel(u) { Width = 300 };
                         p.Status.BindTo(u.Status);

osu.Game/Screens/Menu/OsuLogo.cs

@@ -227,9 +227,6 @@ namespace osu.Game.Screens.Menu
         {
             base.OnNewBeat(beatIndex, timingPoint, effectPoint, amplitudes);
 
-            if (Hovering)
-                sampleBeat.Play();
-
             lastBeatIndex = beatIndex;
 
             var beatLength = timingPoint.BeatLength;
@@ -238,6 +235,9 @@ namespace osu.Game.Screens.Menu
 
             if (beatIndex < 0) return;
 
+            if (Hovering)
+                sampleBeat.Play();
+
             logoBeatContainer.ScaleTo(1 - 0.02f * amplitudeAdjust, beat_in_time, EasingTypes.Out);
             using (logoBeatContainer.BeginDelayedSequence(beat_in_time))
                 logoBeatContainer.ScaleTo(1, beatLength * 2, EasingTypes.OutQuint);

osu.Game/Screens/Multiplayer/RoomInspector.cs

@@ -495,7 +495,7 @@ namespace osu.Game.Screens.Multiplayer
             levelRangeLower.Text = ranks.Min().ToString();
             levelRangeHigher.Text = ranks.Max().ToString();
 
-            participantsFlow.Children = value.Select(u => new UserTile(u));
+            participantsFlow.ChildrenEnumerable = value.Select(u => new UserTile(u));
         }
 
         private class UserTile : Container, IHasTooltip

osu.Game/Screens/Ranking/ResultsPageScore.cs

@@ -164,7 +164,7 @@ namespace osu.Game.Screens.Ranking
                 }
             };
 
-            statisticsContainer.Children = Score.Statistics.Select(s => new DrawableScoreStatistic(s));
+            statisticsContainer.ChildrenEnumerable = Score.Statistics.Select(s => new DrawableScoreStatistic(s));
         }
 
         protected override void LoadComplete()

osu.Game/Screens/Select/BeatmapDetails.cs

@@ -439,7 +439,7 @@ namespace osu.Game.Screens.Select
                     {
                         Show();
                         if (header.Text == "Tags")
-                            content.Children = value.Split(' ').Select(text => new OsuSpriteText
+                            content.ChildrenEnumerable = value.Split(' ').Select(text => new OsuSpriteText
                             {
                                 Text = text,
                                 Font = "Exo2.0-Regular",

osu.Game/Screens/Tournament/Components/VisualiserContainer.cs

@@ -84,7 +84,7 @@ namespace osu.Game.Screens.Tournament.Components
             {
                 base.UpdateAfterChildren();
 
-                while (Children.Count() < 3)
+                while (Children.Count < 3)
                     addLine();
 
                 float pos = leftPos;