Merge branch 'master' into mania-hitexplosion-skinning

osu.Android.props

@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.331.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.401.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.402.0" />
   </ItemGroup>
 </Project>

osu.Game.Rulesets.Mania/Skinning/LegacyHoldNoteHeadPiece.cs

@@ -10,6 +10,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
     {
         protected override Texture GetTexture(ISkinSource skin)
         {
+            // TODO: Should fallback to the head from default legacy skin instead of note.
             return GetTextureFromLookup(skin, LegacyManiaSkinConfigurationLookups.HoldNoteHeadImage)
                    ?? GetTextureFromLookup(skin, LegacyManiaSkinConfigurationLookups.NoteImage);
         }

osu.Game.Rulesets.Mania/Skinning/LegacyHoldNoteTailPiece.cs

@@ -20,8 +20,10 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
         protected override Texture GetTexture(ISkinSource skin)
         {
+            // TODO: Should fallback to the head from default legacy skin instead of note.
             return GetTextureFromLookup(skin, LegacyManiaSkinConfigurationLookups.HoldNoteTailImage)
-                   ?? GetTextureFromLookup(skin, LegacyManiaSkinConfigurationLookups.HoldNoteHeadImage);
+                   ?? GetTextureFromLookup(skin, LegacyManiaSkinConfigurationLookups.HoldNoteHeadImage)
+                   ?? GetTextureFromLookup(skin, LegacyManiaSkinConfigurationLookups.NoteImage);
         }
     }
 }

osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs

@@ -18,6 +18,8 @@ namespace osu.Game.Rulesets.Osu.Skinning
         public LegacySliderBall(Drawable animationContent)
         {
             this.animationContent = animationContent;
+
+            AutoSizeAxes = Axes.Both;
         }
 
         [BackgroundDependencyLoader]

osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs

@@ -62,17 +62,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
                     // Math.Max((150 / Velocity) * GameBase.SIXTY_FRAME_TIME, GameBase.SIXTY_FRAME_TIME);
 
                     if (sliderBallContent != null)
-                    {
+                        return new LegacySliderBall(sliderBallContent);
-                        var size = sliderBallContent.Size;
-
-                        sliderBallContent.RelativeSizeAxes = Axes.Both;
-                        sliderBallContent.Size = Vector2.One;
-
-                        return new LegacySliderBall(sliderBallContent)
-                        {
-                            Size = size
-                        };
-                    }
 
                     return null;
 

osu.Game/Users/User.cs

@@ -173,8 +173,27 @@ namespace osu.Game.Users
             public int Available;
         }
 
+        private UserStatistics statistics;
+
         [JsonProperty(@"statistics")]
-        public UserStatistics Statistics;
+        public UserStatistics Statistics
+        {
+            get => statistics ??= new UserStatistics();
+            set
+            {
+                if (statistics != null)
+                    // we may already have rank history populated
+                    value.RankHistory = statistics.RankHistory;
+
+                statistics = value;
+            }
+        }
+
+        [JsonProperty(@"rankHistory")]
+        private RankHistoryData rankHistory
+        {
+            set => statistics.RankHistory = value;
+        }
 
         public class RankHistoryData
         {
@@ -185,12 +204,6 @@ namespace osu.Game.Users
             public int[] Data;
         }
 
-        [JsonProperty(@"rankHistory")]
-        private RankHistoryData rankHistory
-        {
-            set => Statistics.RankHistory = value;
-        }
-
         [JsonProperty("badges")]
         public Badge[] Badges;
 

osu.Game/osu.Game.csproj

@@ -23,7 +23,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.331.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.401.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.402.0" />
     <PackageReference Include="Sentry" Version="2.1.1" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />

osu.iOS.props

@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.331.0" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.401.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.402.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
@@ -79,7 +79,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.401.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.402.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />