Merge branch 'master' into menu-background-skinning

osu.Desktop/OsuGameDesktop.cs

@@ -97,7 +97,7 @@ namespace osu.Desktop
 
         private void fileDrop(object sender, FileDropEventArgs e)
         {
-            var filePaths = new[] { e.FileName };
+            var filePaths = e.FileNames;
 
             var firstExtension = Path.GetExtension(filePaths.First());
 

osu.Desktop/osu.Desktop.csproj

@@ -28,8 +28,8 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="System.IO.Packaging" Version="4.5.0" />
     <PackageReference Include="ppy.squirrel.windows" Version="1.9.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.1" />
   </ItemGroup>
   <ItemGroup Label="Resources">
     <EmbeddedResource Include="lazer.ico" />

osu.Game.Rulesets.Catch.Tests/TestCaseCatchStacker.cs

@@ -26,7 +26,6 @@ namespace osu.Game.Rulesets.Catch.Tests
                 }
             };
 
-
             for (int i = 0; i < 512; i++)
                 beatmap.HitObjects.Add(new Fruit { X = 0.5f + i / 2048f * (i % 10 - 5), StartTime = i * 100, NewCombo = i % 8 == 0 });
 

osu.Game.Rulesets.Catch.Tests/TestCaseHyperDash.cs

@@ -19,7 +19,6 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             var beatmap = new Beatmap { BeatmapInfo = { Ruleset = ruleset.RulesetInfo } };
 
-
             for (int i = 0; i < 512; i++)
                 if (i % 5 < 3)
                     beatmap.HitObjects.Add(new Fruit { X = i % 10 < 5 ? 0.02f : 0.98f, StartTime = i * 100, NewCombo = i % 8 == 0 });

osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj

@@ -4,7 +4,7 @@
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="NUnit" Version="3.11.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.11.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">

osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs

@@ -14,7 +14,6 @@ namespace osu.Game.Rulesets.Catch.Difficulty
 {
     public class CatchDifficultyCalculator : DifficultyCalculator
     {
-
         /// <summary>
         /// In milliseconds. For difficulty calculation we will only look at the highest strain value in each time interval of size STRAIN_STEP.
         /// This is to eliminate higher influence of stream over aim by simply having more HitObjects with high strain.

osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj

@@ -4,7 +4,7 @@
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="NUnit" Version="3.11.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.11.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">

osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs

@@ -180,7 +180,6 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
 
                 foreach (var obj in newPattern.HitObjects)
                     yield return obj;
-
             }
         }
 

osu.Game.Rulesets.Mania/Difficulty/ManiaDifficultyCalculator.cs

@@ -53,7 +53,6 @@ namespace osu.Game.Rulesets.Mania.Difficulty
             if (!calculateStrainValues(difficultyHitObjects, timeRate))
                 return new DifficultyAttributes(mods, 0);
 
-
             double starRating = calculateDifficulty(difficultyHitObjects, timeRate) * star_scaling_factor;
 
             return new ManiaDifficultyAttributes(mods, starRating)

osu.Game.Rulesets.Mania/Mods/ManiaModMirror.cs

@@ -3,14 +3,14 @@
 
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Game.Rulesets.Mania.Objects;
-using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.UI;
 using System.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Mania.Beatmaps;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
-    public class ManiaModMirror : Mod, IApplicableToRulesetContainer<ManiaHitObject>
+    public class ManiaModMirror : Mod, IApplicableToBeatmap<ManiaHitObject>
     {
         public override string Name => "Mirror";
         public override string Acronym => "MR";
@@ -18,11 +18,11 @@ namespace osu.Game.Rulesets.Mania.Mods
         public override double ScoreMultiplier => 1;
         public override bool Ranked => true;
 
-        public void ApplyToRulesetContainer(RulesetContainer<ManiaHitObject> rulesetContainer)
+        public void ApplyToBeatmap(Beatmap<ManiaHitObject> beatmap)
         {
-            var availableColumns = ((ManiaRulesetContainer)rulesetContainer).Beatmap.TotalColumns;
+            var availableColumns = ((ManiaBeatmap)beatmap).TotalColumns;
 
-            rulesetContainer.Objects.OfType<ManiaHitObject>().ForEach(h => h.Column = availableColumns - 1 - h.Column);
+            beatmap.HitObjects.OfType<ManiaHitObject>().ForEach(h => h.Column = availableColumns - 1 - h.Column);
         }
     }
 }

osu.Game.Rulesets.Mania/Mods/ManiaModRandom.cs

@@ -4,15 +4,15 @@
 using System.Linq;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.MathUtils;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics;
+using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;
-using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Mania.Mods
 {
-    public class ManiaModRandom : Mod, IApplicableToRulesetContainer<ManiaHitObject>
+    public class ManiaModRandom : Mod, IApplicableToBeatmap<ManiaHitObject>
     {
         public override string Name => "Random";
         public override string Acronym => "RD";
@@ -21,12 +21,12 @@ namespace osu.Game.Rulesets.Mania.Mods
         public override string Description => @"Shuffle around the keys!";
         public override double ScoreMultiplier => 1;
 
-        public void ApplyToRulesetContainer(RulesetContainer<ManiaHitObject> rulesetContainer)
+        public void ApplyToBeatmap(Beatmap<ManiaHitObject> beatmap)
         {
-            var availableColumns = ((ManiaRulesetContainer)rulesetContainer).Beatmap.TotalColumns;
+            var availableColumns = ((ManiaBeatmap)beatmap).TotalColumns;
             var shuffledColumns = Enumerable.Range(0, availableColumns).OrderBy(item => RNG.Next()).ToList();
 
-            rulesetContainer.Objects.OfType<ManiaHitObject>().ForEach(h => h.Column = shuffledColumns[h.Column]);
+            beatmap.HitObjects.OfType<ManiaHitObject>().ForEach(h => h.Column = shuffledColumns[h.Column]);
         }
     }
 }

osu.Game.Rulesets.Mania/Objects/ManiaHitObjectDifficulty.cs

@@ -21,7 +21,6 @@ namespace osu.Game.Rulesets.Mania.Objects
 
         private readonly int beatmapColumnCount;
 
-
         private readonly double endTime;
         private readonly double[] heldUntil;
 

osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj

@@ -4,7 +4,7 @@
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="NUnit" Version="3.11.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.11.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">

osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs

@@ -57,6 +57,10 @@ namespace osu.Game.Rulesets.Osu.Difficulty
                     s.Process(h);
             }
 
+            // The peak strain will not be saved for the last section in the above loop
+            foreach (Skill s in skills)
+                s.SaveCurrentPeak();
+
             double aimRating = Math.Sqrt(skills[0].DifficultyValue()) * difficulty_multiplier;
             double speedRating = Math.Sqrt(skills[1].DifficultyValue()) * difficulty_multiplier;
             double starRating = aimRating + speedRating + Math.Abs(aimRating - speedRating) / 2;

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

@@ -101,7 +101,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 break;
             }
 
-
             float aimRotation = MathHelper.RadiansToDegrees((float)Math.Atan2(aimRotationVector.Y - Position.Y, aimRotationVector.X - Position.X));
             while (Math.Abs(aimRotation - Rotation) > 180)
                 aimRotation += aimRotation < Rotation ? 360 : -360;

osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj

@@ -4,7 +4,7 @@
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="NUnit" Version="3.11.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.11.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">

osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs

@@ -149,7 +149,6 @@ namespace osu.Game.Tests.Beatmaps.Formats
             using (var stream = Resource.OpenResource(filename))
             using (var sr = new StreamReader(stream))
             {
-
                 var legacyDecoded = new LegacyBeatmapDecoder { ApplyOffsets = false }.Decode(sr);
                 using (var ms = new MemoryStream())
                 using (var sw = new StreamWriter(ms))

osu.Game.Tests/Visual/TestCaseBeatmapCarousel.cs

@@ -40,7 +40,6 @@ namespace osu.Game.Tests.Visual
             typeof(DrawableCarouselBeatmapSet),
         };
 
-
         private readonly Stack<BeatmapSetInfo> selectedSets = new Stack<BeatmapSetInfo>();
         private readonly HashSet<int> eagerSelectedIDs = new HashSet<int>();
 

osu.Game.Tests/Visual/TestCaseBeatmapScoresContainer.cs

@@ -55,7 +55,6 @@ namespace osu.Game.Tests.Visual
             AddStep("resize to normal", () => container.ResizeWidthTo(0.8f, 300));
             AddStep("online scores", () => scoresContainer.Beatmap = new BeatmapInfo { OnlineBeatmapID = 75, Ruleset = new OsuRuleset().RulesetInfo });
 
-
             scores = new[]
             {
                 new APIScoreInfo

osu.Game.Tests/Visual/TestCaseBreadcrumbs.cs

@@ -16,7 +16,6 @@ namespace osu.Game.Tests.Visual
 
         public TestCaseBreadcrumbs()
         {
-
             Add(breadcrumbs = new BreadcrumbControl<BreadcrumbTab>
             {
                 Anchor = Anchor.Centre,

osu.Game.Tests/Visual/TestCaseKeyCounter.cs

@@ -39,7 +39,6 @@ namespace osu.Game.Tests.Visual
                 },
             };
 
-
             AddStep("Add random", () =>
             {
                 Key key = (Key)((int)Key.A + RNG.Next(26));

osu.Game.Tests/Visual/TestCasePlayerLoader.cs

@@ -57,5 +57,4 @@ namespace osu.Game.Tests.Visual
             }
         }
     }
-
 }

osu.Game.Tests/Visual/TestCaseSkipOverlay.cs

@@ -7,7 +7,7 @@ using osu.Game.Screens.Play;
 namespace osu.Game.Tests.Visual
 {
     [TestFixture]
-    public class TestCaseSkipButton : OsuTestCase
+    public class TestCaseSkipOverlay : OsuTestCase
     {
         protected override void LoadComplete()
         {

osu.Game.Tests/osu.Game.Tests.csproj

@@ -5,7 +5,7 @@
     <PackageReference Include="DeepEqual" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="NUnit" Version="3.11.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.11.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">

osu.Game/Graphics/Containers/ScalingContainer.cs

@@ -28,6 +28,8 @@ namespace osu.Game.Graphics.Containers
         private readonly Container content;
         protected override Container<Drawable> Content => content;
 
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
+
         private readonly Container sizableContainer;
 
         private Drawable backgroundLayer;
@@ -41,7 +43,7 @@ namespace osu.Game.Graphics.Containers
             this.targetMode = targetMode;
             RelativeSizeAxes = Axes.Both;
 
-            InternalChild = sizableContainer = new Container
+            InternalChild = sizableContainer = new AlwaysInputContainer
             {
                 RelativeSizeAxes = Axes.Both,
                 RelativePositionAxes = Axes.Both,
@@ -55,6 +57,8 @@ namespace osu.Game.Graphics.Containers
             private readonly bool applyUIScale;
             private Bindable<float> uiScale;
 
+            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
+
             public ScalingDrawSizePreservingFillContainer(bool applyUIScale)
             {
                 this.applyUIScale = applyUIScale;
@@ -143,5 +147,15 @@ namespace osu.Game.Graphics.Containers
             sizableContainer.MoveTo(targetPosition, 500, Easing.OutQuart);
             sizableContainer.ResizeTo(targetSize, 500, Easing.OutQuart).OnComplete(_ => { sizableContainer.Masking = requiresMasking; });
         }
+
+        private class AlwaysInputContainer : Container
+        {
+            public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
+
+            public AlwaysInputContainer()
+            {
+                RelativeSizeAxes = Axes.Both;
+            }
+        }
     }
 }

osu.Game/Graphics/UserInterface/OsuTabControl.cs

@@ -160,7 +160,6 @@ namespace osu.Game.Graphics.UserInterface
                         Anchor = Anchor.BottomLeft,
                         Text = (value as IHasDescription)?.Description ?? (value as Enum)?.GetDescription() ?? value.ToString(),
                         TextSize = 14,
-                        Font = @"Exo2.0-Bold", // Font should only turn bold when active?
                     },
                     Bar = new Box
                     {
@@ -173,6 +172,8 @@ namespace osu.Game.Graphics.UserInterface
                     },
                     new HoverClickSounds()
                 };
+
+                Active.BindValueChanged(val => Text.Font = val ? @"Exo2.0-Bold" : @"Exo2.0", true);
             }
 
             protected override void OnActivated() => fadeActive();

osu.Game/Graphics/UserInterface/PageTabControl.cs

@@ -46,7 +46,6 @@ namespace osu.Game.Graphics.UserInterface
                         Anchor = Anchor.BottomLeft,
                         Text = (value as Enum)?.GetDescription() ?? value.ToString(),
                         TextSize = 14,
-                        Font = @"Exo2.0-Bold",
                     },
                     box = new Box
                     {
@@ -59,6 +58,8 @@ namespace osu.Game.Graphics.UserInterface
                     },
                     new HoverClickSounds()
                 };
+
+                Active.BindValueChanged(val => Text.Font = val ? @"Exo2.0-Bold" : @"Exo2.0", true);
             }
 
             [BackgroundDependencyLoader]

osu.Game/Online/Chat/Channel.cs

@@ -41,7 +41,6 @@ namespace osu.Game.Online.Chat
         /// </summary>
         private readonly List<LocalEchoMessage> pendingMessages = new List<LocalEchoMessage>();
 
-
         /// <summary>
         /// An event that fires when new messages arrived.
         /// </summary>

osu.Game/Overlays/Chat/Tabs/PrivateChannelTabItem.cs

@@ -77,7 +77,6 @@ namespace osu.Game.Overlays.Chat.Tabs
             CloseButton.FadeIn(TRANSITION_LENGTH, Easing.OutQuint);
         }
 
-
         protected override void FadeInactive()
         {
             base.FadeInactive();

osu.Game/Overlays/KeyBinding/GlobalKeyBindingsSection.cs

@@ -18,7 +18,6 @@ namespace osu.Game.Overlays.KeyBinding
             Add(new InGameKeyBindingsSubsection(manager));
         }
 
-
         private class DefaultBindingsSubsection : KeyBindingsSubsection
         {
             protected override string Header => string.Empty;

osu.Game/Overlays/Mods/ModSelectOverlay.cs

@@ -176,7 +176,6 @@ namespace osu.Game.Overlays.Mods
                 section.DeselectTypes(modTypes, immediate);
         }
 
-
         private SampleChannel sampleOn, sampleOff;
 
         private void modButtonPressed(Mod selectedMod)

osu.Game/Overlays/Profile/Sections/Historical/PaginatedMostPlayedBeatmapContainer.cs

@@ -49,7 +49,6 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
             Api.Queue(request);
         }
 
-
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);

osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs

@@ -124,7 +124,6 @@ namespace osu.Game.Rulesets.Objects.Legacy
                     // osu-stable treated the first span of the slider as a repeat, but no repeats are happening
                     repeatCount = Math.Max(0, repeatCount - 1);
 
-
                     if (split.Length > 7)
                         length = Convert.ToDouble(split[7], CultureInfo.InvariantCulture);
 

osu.Game/Screens/Edit/Components/TimeInfoContainer.cs

@@ -17,7 +17,6 @@ namespace osu.Game.Screens.Edit.Components
 
         public TimeInfoContainer()
         {
-
             Children = new Drawable[]
             {
                 trackTimer = new OsuSpriteText

osu.Game/Screens/Play/SkipOverlay.cs

@@ -46,10 +46,10 @@ namespace osu.Game.Screens.Play
             State = Visibility.Visible;
 
             RelativePositionAxes = Axes.Both;
-            RelativeSizeAxes = Axes.Both;
+            RelativeSizeAxes = Axes.X;
 
             Position = new Vector2(0.5f, 0.7f);
-            Size = new Vector2(1, 0.14f);
+            Size = new Vector2(1, 100);
 
             Origin = Anchor.Centre;
         }

osu.Game/Screens/Select/BeatmapCarousel.cs

@@ -101,7 +101,6 @@ namespace osu.Game.Screens.Select
 
         private readonly Container<DrawableCarouselItem> scrollableContent;
 
-
         public Bindable<bool> RightClickScrollingEnabled = new Bindable<bool>();
 
         public Bindable<RandomSelectAlgorithm> RandomAlgorithm = new Bindable<RandomSelectAlgorithm>();

osu.Game/Users/UserStatistics.cs

@@ -78,6 +78,5 @@ namespace osu.Game.Users
             [JsonProperty(@"country")]
             public int? Country;
         }
-
     }
 }

osu.Game/osu.Game.csproj

@@ -15,10 +15,10 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="Humanizer" Version="2.5.16" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2019.110.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2019.116.0" />
     <PackageReference Include="SharpCompress" Version="0.22.0" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />