Merge branch 'master' into muted-notification

osu.Android.props

@@ -62,6 +62,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.913.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2019.924.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2019.930.0" />
   </ItemGroup>
 </Project>

osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs

@@ -107,6 +107,15 @@ namespace osu.Game.Tests.Visual.Online
                 CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"
             }, api.IsLoggedIn));
 
+            AddStep("Show bancho", () => profile.ShowUser(new User
+            {
+                Username = @"BanchoBot",
+                Id = 3,
+                IsBot = true,
+                Country = new Country { FullName = @"Saint Helena", FlagName = @"SH" },
+                CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c4.jpg"
+            }, api.IsLoggedIn));
+
             AddStep("Hide", profile.Hide);
             AddStep("Show without reload", profile.Show);
         }

osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs

@@ -82,8 +82,8 @@ namespace osu.Game.Tests.Visual.SongSelect
         private void ensureRandomFetchSuccess() =>
             AddAssert("ensure prev random fetch worked", () => selectedSets.Peek() == carousel.SelectedBeatmapSet);
 
-        private void checkSelected(int set, int? diff = null) =>
+        private void waitForSelection(int set, int? diff = null) =>
-            AddAssert($"selected is set{set}{(diff.HasValue ? $" diff{diff.Value}" : "")}", () =>
+            AddUntilStep($"selected is set{set}{(diff.HasValue ? $" diff{diff.Value}" : "")}", () =>
             {
                 if (diff != null)
                     return carousel.SelectedBeatmap == carousel.BeatmapSets.Skip(set - 1).First().Beatmaps.Skip(diff.Value - 1).First();
@@ -168,24 +168,24 @@ namespace osu.Game.Tests.Visual.SongSelect
             loadBeatmaps();
 
             advanceSelection(direction: 1, diff: false);
-            checkSelected(1, 1);
+            waitForSelection(1, 1);
 
             advanceSelection(direction: 1, diff: true);
-            checkSelected(1, 2);
+            waitForSelection(1, 2);
 
             advanceSelection(direction: -1, diff: false);
-            checkSelected(set_count, 1);
+            waitForSelection(set_count, 1);
 
             advanceSelection(direction: -1, diff: true);
-            checkSelected(set_count - 1, 3);
+            waitForSelection(set_count - 1, 3);
 
             advanceSelection(diff: false);
             advanceSelection(diff: false);
-            checkSelected(1, 2);
+            waitForSelection(1, 2);
 
             advanceSelection(direction: -1, diff: true);
             advanceSelection(direction: -1, diff: true);
-            checkSelected(set_count, 3);
+            waitForSelection(set_count, 3);
         }
 
         /// <summary>
@@ -203,10 +203,10 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddStep("Filter", () => carousel.Filter(new FilterCriteria { SearchText = "set #3!" }, false));
             checkVisibleItemCount(diff: false, count: 1);
             checkVisibleItemCount(diff: true, count: 3);
-            checkSelected(3, 1);
+            waitForSelection(3, 1);
 
             advanceSelection(diff: true, count: 4);
-            checkSelected(3, 2);
+            waitForSelection(3, 2);
 
             AddStep("Un-filter (debounce)", () => carousel.Filter(new FilterCriteria()));
             AddUntilStep("Wait for debounce", () => !carousel.PendingFilterTask);
@@ -217,10 +217,10 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             setSelected(1, 2);
             AddStep("Filter some difficulties", () => carousel.Filter(new FilterCriteria { SearchText = "Normal" }, false));
-            checkSelected(1, 1);
+            waitForSelection(1, 1);
 
             AddStep("Un-filter", () => carousel.Filter(new FilterCriteria(), false));
-            checkSelected(1, 1);
+            waitForSelection(1, 1);
 
             AddStep("Filter all", () => carousel.Filter(new FilterCriteria { SearchText = "Dingo" }, false));
 
@@ -249,7 +249,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     IsLowerInclusive = true
                 }
             }, false));
-            checkSelected(3, 2);
+            waitForSelection(3, 2);
 
             AddStep("Un-filter", () => carousel.Filter(new FilterCriteria(), false));
         }
@@ -317,7 +317,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             checkVisibleItemCount(false, set_count);
 
-            checkSelected(set_count);
+            waitForSelection(set_count);
         }
 
         /// <summary>
@@ -343,11 +343,11 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("Selection is non-null", () => currentSelection != null);
 
             AddStep("Remove selected", () => carousel.RemoveBeatmapSet(carousel.SelectedBeatmapSet));
-            checkSelected(2);
+            waitForSelection(2);
 
             AddStep("Remove first", () => carousel.RemoveBeatmapSet(carousel.BeatmapSets.First()));
             AddStep("Remove first", () => carousel.RemoveBeatmapSet(carousel.BeatmapSets.First()));
-            checkSelected(1);
+            waitForSelection(1);
 
             AddUntilStep("Remove all", () =>
             {
@@ -390,17 +390,17 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             checkVisibleItemCount(true, 2);
             advanceSelection(true);
-            checkSelected(1, 3);
+            waitForSelection(1, 3);
 
             setHidden(3);
-            checkSelected(1, 1);
+            waitForSelection(1, 1);
 
             setHidden(2, false);
             advanceSelection(true);
-            checkSelected(1, 2);
+            waitForSelection(1, 2);
 
             setHidden(1);
-            checkSelected(1, 2);
+            waitForSelection(1, 2);
 
             setHidden(2);
             checkNoSelection();

osu.Game/Configuration/IntroSequence.cs

@@ -6,6 +6,7 @@ namespace osu.Game.Configuration
     public enum IntroSequence
     {
         Circles,
-        Triangles
+        Triangles,
+        Random
     }
 }

osu.Game/Overlays/MusicController.cs

@@ -75,7 +75,7 @@ namespace osu.Game.Overlays
         /// <summary>
         /// Returns whether the current beatmap track is playing.
         /// </summary>
-        public bool IsPlaying => beatmap.Value.Track.IsRunning;
+        public bool IsPlaying => beatmap.Value?.Track.IsRunning ?? false;
 
         private void handleBeatmapAdded(BeatmapSetInfo set) =>
             Schedule(() => beatmapSets.Add(set));

osu.Game/Overlays/UserProfileOverlay.cs

@@ -44,7 +44,8 @@ namespace osu.Game.Overlays
             Clear();
             lastSection = null;
 
-            sections = new ProfileSection[]
+            sections = !user.IsBot
+                ? new ProfileSection[]
                 {
                     //new AboutSection(),
                     new RecentSection(),
@@ -53,6 +54,10 @@ namespace osu.Game.Overlays
                     new HistoricalSection(),
                     new BeatmapsSection(),
                     new KudosuSection()
+                }
+                : new ProfileSection[]
+                {
+                    //new AboutSection(),
                 };
 
             tabs = new ProfileTabControl

osu.Game/Rulesets/RulesetStore.cs

@@ -135,9 +135,9 @@ namespace osu.Game.Rulesets
                 foreach (string file in files.Where(f => !Path.GetFileName(f).Contains("Tests")))
                     loadRulesetFromFile(file);
             }
-            catch
+            catch (Exception e)
             {
-                Logger.Log($"Could not load rulesets from directory {Environment.CurrentDirectory}");
+                Logger.Error(e, $"Could not load rulesets from directory {Environment.CurrentDirectory}");
             }
         }
 

osu.Game/Screens/Loader.cs

@@ -6,6 +6,7 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shaders;
+using osu.Framework.MathUtils;
 using osu.Game.Screens.Menu;
 using osuTK;
 using osu.Framework.Screens;
@@ -59,6 +60,9 @@ namespace osu.Game.Screens
 
         private IntroScreen getIntroSequence()
         {
+            if (introSequence == IntroSequence.Random)
+                introSequence = (IntroSequence)RNG.Next(0, (int)IntroSequence.Random);
+
             switch (introSequence)
             {
                 case IntroSequence.Circles:

osu.Game/Users/User.cs

@@ -78,6 +78,9 @@ namespace osu.Game.Users
         [JsonProperty(@"is_bng")]
         public bool IsBNG;
 
+        [JsonProperty(@"is_bot")]
+        public bool IsBot;
+
         [JsonProperty(@"is_active")]
         public bool Active;
 

osu.Game/osu.Game.csproj

@@ -26,7 +26,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.913.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2019.924.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2019.930.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

osu.iOS.props

@@ -118,8 +118,8 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.913.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2019.924.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2019.930.0" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2019.924.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2019.930.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />