diff --git a/README.md b/README.md
index 016bd7d922..8f922f74a7 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
# osu!
-[](https://ci.appveyor.com/project/peppy/osu)
+[](https://github.com/ppy/osu/actions/workflows/ci.yml)
[](https://github.com/ppy/osu/releases/latest)
[](https://www.codefactor.io/repository/github/ppy/osu)
[](https://discord.gg/ppy)
diff --git a/osu.Android.props b/osu.Android.props
index 7a0a542ee9..8de516240f 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -51,8 +51,8 @@
<Reference Include="Java.Interop" />
</ItemGroup>
<ItemGroup>
- <PackageReference Include="ppy.osu.Game.Resources" Version="2021.808.0" />
- <PackageReference Include="ppy.osu.Framework.Android" Version="2021.807.0" />
+ <PackageReference Include="ppy.osu.Game.Resources" Version="2021.810.0" />
+ <PackageReference Include="ppy.osu.Framework.Android" Version="2021.810.0" />
</ItemGroup>
<ItemGroup Label="Transitive Dependencies">
<!-- Realm needs to be directly referenced in all Xamarin projects, as it will not pull in its transitive dependencies otherwise. -->
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBody.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBody.cs
index 744ded37c9..1c8dfeac52 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBody.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySliderBody.cs
@@ -3,9 +3,9 @@
using System;
using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Utils;
using osu.Game.Rulesets.Osu.Objects;
using osu.Game.Rulesets.Osu.Skinning.Default;
+using osu.Game.Utils;
using osuTK.Graphics;
namespace osu.Game.Rulesets.Osu.Skinning.Legacy
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
// Roughly matches osu!stable's slider border portions.
=> base.CalculatedBorderPortion * 0.77f;
- public new Color4 AccentColour => new Color4(base.AccentColour.R, base.AccentColour.G, base.AccentColour.B, base.AccentColour.A * 0.70f);
+ public new Color4 AccentColour => new Color4(base.AccentColour.R, base.AccentColour.G, base.AccentColour.B, 0.7f);
protected override Color4 ColourAt(float position)
{
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
Color4 outerColour = AccentColour.Darken(0.1f);
Color4 innerColour = lighten(AccentColour, 0.5f);
- return Interpolation.ValueAt(position / realGradientPortion, outerColour, innerColour, 0, 1);
+ return LegacyUtils.InterpolateNonLinear(position / realGradientPortion, outerColour, innerColour, 0, 1);
}
/// <summary>
diff --git a/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs b/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs
index 0ce71696bd..58f4c4c8db 100644
--- a/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneDrawableHitObject.cs
@@ -2,11 +2,13 @@
// See the LICENCE file in the repository root for full licence text.
using NUnit.Framework;
+using osu.Framework.Graphics;
using osu.Framework.Testing;
using osu.Game.Beatmaps;
using osu.Game.Beatmaps.ControlPoints;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Scoring;
using osu.Game.Tests.Visual;
namespace osu.Game.Tests.Gameplay
@@ -121,6 +123,18 @@ namespace osu.Game.Tests.Gameplay
AddAssert("Drawable lifetime is restored", () => dho.LifetimeStart == 666 && dho.LifetimeEnd == 999);
}
+ [Test]
+ public void TestStateChangeBeforeLoadComplete()
+ {
+ TestDrawableHitObject dho = null;
+ AddStep("Add DHO and apply result", () =>
+ {
+ Child = dho = new TestDrawableHitObject(new HitObject { StartTime = Time.Current });
+ dho.MissForcefully();
+ });
+ AddAssert("DHO state is correct", () => dho.State.Value == ArmedState.Miss);
+ }
+
private class TestDrawableHitObject : DrawableHitObject
{
public const double INITIAL_LIFETIME_OFFSET = 100;
@@ -141,6 +155,19 @@ namespace osu.Game.Tests.Gameplay
if (SetLifetimeStartOnApply)
LifetimeStart = LIFETIME_ON_APPLY;
}
+
+ public void MissForcefully() => ApplyResult(r => r.Type = HitResult.Miss);
+
+ protected override void UpdateHitStateTransforms(ArmedState state)
+ {
+ if (state != ArmedState.Miss)
+ {
+ base.UpdateHitStateTransforms(state);
+ return;
+ }
+
+ this.FadeOut(1000);
+ }
}
private class TestLifetimeEntry : HitObjectLifetimeEntry
diff --git a/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs b/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs
index 0983b806e2..07ec86b0e7 100644
--- a/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs
+++ b/osu.Game.Tests/NonVisual/Multiplayer/StatefulMultiplayerClientTest.cs
@@ -24,6 +24,8 @@ namespace osu.Game.Tests.NonVisual.Multiplayer
AddRepeatStep("add some users", () => Client.AddUser(new User { Id = id++ }), 5);
checkPlayingUserCount(0);
+ AddAssert("playlist item is available", () => Client.CurrentMatchPlayingItem.Value != null);
+
changeState(3, MultiplayerUserState.WaitingForLoad);
checkPlayingUserCount(3);
@@ -41,6 +43,8 @@ namespace osu.Game.Tests.NonVisual.Multiplayer
AddStep("leave room", () => Client.LeaveRoom());
checkPlayingUserCount(0);
+
+ AddAssert("playlist item is null", () => Client.CurrentMatchPlayingItem.Value == null);
}
[Test]
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
index dfb78a235b..93bdbb79f4 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
@@ -14,7 +14,7 @@ using osu.Game.Beatmaps;
using osu.Game.Beatmaps.Drawables;
using osu.Game.Graphics.Containers;
using osu.Game.Online.Rooms;
-using osu.Game.Overlays;
+using osu.Game.Overlays.BeatmapListing.Panels;
using osu.Game.Rulesets;
using osu.Game.Rulesets.Osu;
using osu.Game.Rulesets.Osu.Mods;
@@ -215,7 +215,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
assertDownloadButtonVisible(false);
void assertDownloadButtonVisible(bool visible) => AddUntilStep($"download button {(visible ? "shown" : "hidden")}",
- () => playlist.ChildrenOfType<BeatmapDownloadTrackingComposite>().Single().Alpha == (visible ? 1 : 0));
+ () => playlist.ChildrenOfType<BeatmapPanelDownloadButton>().Single().Alpha == (visible ? 1 : 0));
}
[Test]
@@ -229,7 +229,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
createPlaylist(byOnlineId, byChecksum);
- AddAssert("download buttons shown", () => playlist.ChildrenOfType<BeatmapDownloadTrackingComposite>().All(d => d.IsPresent));
+ AddAssert("download buttons shown", () => playlist.ChildrenOfType<BeatmapPanelDownloadButton>().All(d => d.IsPresent));
}
[Test]
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
index 072e32370d..e9fae32335 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
@@ -12,6 +12,7 @@ using osu.Game.Rulesets.UI;
using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate;
using osu.Game.Screens.Play;
using osu.Game.Tests.Beatmaps.IO;
+using osu.Game.Users;
namespace osu.Game.Tests.Visual.Multiplayer
{
@@ -47,8 +48,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
{
AddStep("start players silently", () =>
{
- Client.CurrentMatchPlayingUserIds.Add(PLAYER_1_ID);
- Client.CurrentMatchPlayingUserIds.Add(PLAYER_2_ID);
+ OnlinePlayDependencies.Client.AddUser(new User { Id = PLAYER_1_ID }, true);
+ OnlinePlayDependencies.Client.AddUser(new User { Id = PLAYER_2_ID }, true);
+
playingUserIds.Add(PLAYER_1_ID);
playingUserIds.Add(PLAYER_2_ID);
});
@@ -264,7 +266,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
{
foreach (int id in userIds)
{
- Client.CurrentMatchPlayingUserIds.Add(id);
+ OnlinePlayDependencies.Client.AddUser(new User { Id = id }, true);
+
SpectatorClient.StartPlay(id, beatmapId ?? importedBeatmapId);
playingUserIds.Add(id);
}
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
index 0e368b59dd..8121492a0b 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
@@ -20,6 +20,7 @@ using osu.Game.Scoring;
using osu.Game.Screens.Play.HUD;
using osu.Game.Tests.Visual.OnlinePlay;
using osu.Game.Tests.Visual.Spectator;
+using osu.Game.Users;
namespace osu.Game.Tests.Visual.Multiplayer
{
@@ -53,10 +54,10 @@ namespace osu.Game.Tests.Visual.Multiplayer
var playable = Beatmap.Value.GetPlayableBeatmap(Ruleset.Value);
foreach (var user in users)
+ {
SpectatorClient.StartPlay(user, Beatmap.Value.BeatmapInfo.OnlineBeatmapID ?? 0);
-
- // Todo: This is REALLY bad.
- Client.CurrentMatchPlayingUserIds.AddRange(users);
+ OnlinePlayDependencies.Client.AddUser(new User { Id = user }, true);
+ }
Children = new Drawable[]
{
diff --git a/osu.Game/Database/IModelManager.cs b/osu.Game/Database/IModelManager.cs
index 7f7e5565f1..8c314f1617 100644
--- a/osu.Game/Database/IModelManager.cs
+++ b/osu.Game/Database/IModelManager.cs
@@ -13,8 +13,16 @@ namespace osu.Game.Database
public interface IModelManager<TModel>
where TModel : class
{
+ /// <summary>
+ /// A bindable which contains a weak reference to the last item that was updated.
+ /// This is not thread-safe and should be scheduled locally if consumed from a drawable component.
+ /// </summary>
IBindable<WeakReference<TModel>> ItemUpdated { get; }
+ /// <summary>
+ /// A bindable which contains a weak reference to the last item that was removed.
+ /// This is not thread-safe and should be scheduled locally if consumed from a drawable component.
+ /// </summary>
IBindable<WeakReference<TModel>> ItemRemoved { get; }
}
}
diff --git a/osu.Game/Graphics/UserInterface/GrayButton.cs b/osu.Game/Graphics/UserInterface/GrayButton.cs
index 88c46f29e0..0a2c83d5a8 100644
--- a/osu.Game/Graphics/UserInterface/GrayButton.cs
+++ b/osu.Game/Graphics/UserInterface/GrayButton.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Graphics.UserInterface
[BackgroundDependencyLoader]
private void load()
{
- Children = new Drawable[]
+ AddRange(new Drawable[]
{
Background = new Box
{
@@ -42,7 +42,7 @@ namespace osu.Game.Graphics.UserInterface
Size = new Vector2(13),
Icon = icon,
},
- };
+ });
}
}
}
diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index bffb2d341a..dafc737ba2 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -62,7 +62,9 @@ namespace osu.Game.Online.Multiplayer
/// <summary>
/// The users in the joined <see cref="Room"/> which are participating in the current gameplay loop.
/// </summary>
- public readonly BindableList<int> CurrentMatchPlayingUserIds = new BindableList<int>();
+ public IBindableList<int> CurrentMatchPlayingUserIds => PlayingUserIds;
+
+ protected readonly BindableList<int> PlayingUserIds = new BindableList<int>();
public readonly Bindable<PlaylistItem?> CurrentMatchPlayingItem = new Bindable<PlaylistItem?>();
@@ -179,7 +181,8 @@ namespace osu.Game.Online.Multiplayer
{
APIRoom = null;
Room = null;
- CurrentMatchPlayingUserIds.Clear();
+ CurrentMatchPlayingItem.Value = null;
+ PlayingUserIds.Clear();
RoomUpdated?.Invoke();
});
@@ -376,7 +379,7 @@ namespace osu.Game.Online.Multiplayer
return;
Room.Users.Remove(user);
- CurrentMatchPlayingUserIds.Remove(user.UserID);
+ PlayingUserIds.Remove(user.UserID);
RoomUpdated?.Invoke();
}, false);
@@ -659,16 +662,16 @@ namespace osu.Game.Online.Multiplayer
/// <param name="state">The new state of the user.</param>
private void updateUserPlayingState(int userId, MultiplayerUserState state)
{
- bool wasPlaying = CurrentMatchPlayingUserIds.Contains(userId);
+ bool wasPlaying = PlayingUserIds.Contains(userId);
bool isPlaying = state >= MultiplayerUserState.WaitingForLoad && state <= MultiplayerUserState.FinishedPlay;
if (isPlaying == wasPlaying)
return;
if (isPlaying)
- CurrentMatchPlayingUserIds.Add(userId);
+ PlayingUserIds.Add(userId);
else
- CurrentMatchPlayingUserIds.Remove(userId);
+ PlayingUserIds.Remove(userId);
}
private Task scheduleAsync(Action action, CancellationToken cancellationToken = default)
diff --git a/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs
index 72ea84d4a8..86879ba245 100644
--- a/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs
+++ b/osu.Game/Online/Rooms/OnlinePlayBeatmapAvailabilityTracker.cs
@@ -59,8 +59,8 @@ namespace osu.Game.Online.Rooms
protected override bool VerifyDatabasedModel(BeatmapSetInfo databasedSet)
{
- int? beatmapId = SelectedItem.Value.Beatmap.Value.OnlineBeatmapID;
- string checksum = SelectedItem.Value.Beatmap.Value.MD5Hash;
+ int? beatmapId = SelectedItem.Value?.Beatmap.Value.OnlineBeatmapID;
+ string checksum = SelectedItem.Value?.Beatmap.Value.MD5Hash;
var matchingBeatmap = databasedSet.Beatmaps.FirstOrDefault(b => b.OnlineBeatmapID == beatmapId && b.MD5Hash == checksum);
diff --git a/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelDownloadButton.cs b/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelDownloadButton.cs
index cec1a5ac12..47b477ef9a 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelDownloadButton.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelDownloadButton.cs
@@ -37,6 +37,13 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
RelativeSizeAxes = Axes.Both,
},
};
+
+ button.Add(new DownloadProgressBar(beatmapSet)
+ {
+ Anchor = Anchor.BottomLeft,
+ Origin = Anchor.BottomLeft,
+ Depth = -1,
+ });
}
protected override void LoadComplete()
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 25f3b8931a..29d8a475ef 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -190,7 +190,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
comboIndexBindable.BindValueChanged(_ => UpdateComboColour());
comboIndexWithOffsetsBindable.BindValueChanged(_ => UpdateComboColour(), true);
- updateState(ArmedState.Idle, true);
+ // Apply transforms
+ updateState(State.Value, true);
}
/// <summary>
diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index a10c16fcd5..7ee77759b0 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Screens.Play.HUD
private UserLookupCache userLookupCache { get; set; }
private readonly ScoreProcessor scoreProcessor;
- private readonly BindableList<int> playingUsers;
+ private readonly IBindableList<int> playingUsers;
private Bindable<ScoringMode> scoringMode;
/// <summary>
diff --git a/osu.Game/Skinning/LegacyHealthDisplay.cs b/osu.Game/Skinning/LegacyHealthDisplay.cs
index 67280e4acd..b1cd1f86c0 100644
--- a/osu.Game/Skinning/LegacyHealthDisplay.cs
+++ b/osu.Game/Skinning/LegacyHealthDisplay.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Textures;
using osu.Framework.Utils;
using osu.Game.Rulesets.Judgements;
using osu.Game.Screens.Play.HUD;
+using osu.Game.Utils;
using osuTK;
using osuTK.Graphics;
@@ -83,10 +84,10 @@ namespace osu.Game.Skinning
private static Color4 getFillColour(double hp)
{
if (hp < 0.2)
- return Interpolation.ValueAt(0.2 - hp, Color4.Black, Color4.Red, 0, 0.2);
+ return LegacyUtils.InterpolateNonLinear(0.2 - hp, Color4.Black, Color4.Red, 0, 0.2);
if (hp < epic_cutoff)
- return Interpolation.ValueAt(0.5 - hp, Color4.White, Color4.Black, 0, 0.5);
+ return LegacyUtils.InterpolateNonLinear(0.5 - hp, Color4.White, Color4.Black, 0, 0.5);
return Color4.White;
}
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index 43aadf5acb..cffaea5c94 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -50,7 +50,16 @@ namespace osu.Game.Tests.Visual.Multiplayer
public void Disconnect() => isConnected.Value = false;
- public void AddUser(User user) => ((IMultiplayerClient)this).UserJoined(new MultiplayerRoomUser(user.Id) { User = user });
+ public MultiplayerRoomUser AddUser(User user, bool markAsPlaying = false)
+ {
+ var roomUser = new MultiplayerRoomUser(user.Id) { User = user };
+ ((IMultiplayerClient)this).UserJoined(roomUser);
+
+ if (markAsPlaying)
+ PlayingUserIds.Add(user.Id);
+
+ return roomUser;
+ }
public void AddNullUser(int userId) => ((IMultiplayerClient)this).UserJoined(new MultiplayerRoomUser(userId));
diff --git a/osu.Game/Utils/LegacyUtils.cs b/osu.Game/Utils/LegacyUtils.cs
new file mode 100644
index 0000000000..64306adf50
--- /dev/null
+++ b/osu.Game/Utils/LegacyUtils.cs
@@ -0,0 +1,65 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Transforms;
+using osuTK.Graphics;
+
+namespace osu.Game.Utils
+{
+ public static class LegacyUtils
+ {
+ public static Color4 InterpolateNonLinear(double time, Color4 startColour, Color4 endColour, double startTime, double endTime, Easing easing = Easing.None)
+ => InterpolateNonLinear(time, startColour, endColour, startTime, endTime, new DefaultEasingFunction(easing));
+
+ public static Colour4 InterpolateNonLinear(double time, Colour4 startColour, Colour4 endColour, double startTime, double endTime, Easing easing = Easing.None)
+ => InterpolateNonLinear(time, startColour, endColour, startTime, endTime, new DefaultEasingFunction(easing));
+
+ /// <summary>
+ /// Interpolates between two sRGB <see cref="Color4"/>s directly in sRGB space.
+ /// </summary>
+ public static Color4 InterpolateNonLinear<TEasing>(double time, Color4 startColour, Color4 endColour, double startTime, double endTime, TEasing easing) where TEasing : IEasingFunction
+ {
+ if (startColour == endColour)
+ return startColour;
+
+ double current = time - startTime;
+ double duration = endTime - startTime;
+
+ if (duration == 0 || current == 0)
+ return startColour;
+
+ float t = Math.Max(0, Math.Min(1, (float)easing.ApplyEasing(current / duration)));
+
+ return new Color4(
+ startColour.R + t * (endColour.R - startColour.R),
+ startColour.G + t * (endColour.G - startColour.G),
+ startColour.B + t * (endColour.B - startColour.B),
+ startColour.A + t * (endColour.A - startColour.A));
+ }
+
+ /// <summary>
+ /// Interpolates between two sRGB <see cref="Colour4"/>s directly in sRGB space.
+ /// </summary>
+ public static Colour4 InterpolateNonLinear<TEasing>(double time, Colour4 startColour, Colour4 endColour, double startTime, double endTime, TEasing easing) where TEasing : IEasingFunction
+ {
+ if (startColour == endColour)
+ return startColour;
+
+ double current = time - startTime;
+ double duration = endTime - startTime;
+
+ if (duration == 0 || current == 0)
+ return startColour;
+
+ float t = Math.Max(0, Math.Min(1, (float)easing.ApplyEasing(current / duration)));
+
+ return new Colour4(
+ startColour.R + t * (endColour.R - startColour.R),
+ startColour.G + t * (endColour.G - startColour.G),
+ startColour.B + t * (endColour.B - startColour.B),
+ startColour.A + t * (endColour.A - startColour.A));
+ }
+ }
+}
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 0a6522f15e..59283084db 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,8 +36,8 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Realm" Version="10.3.0" />
- <PackageReference Include="ppy.osu.Framework" Version="2021.807.0" />
- <PackageReference Include="ppy.osu.Game.Resources" Version="2021.808.0" />
+ <PackageReference Include="ppy.osu.Framework" Version="2021.810.0" />
+ <PackageReference Include="ppy.osu.Game.Resources" Version="2021.810.0" />
<PackageReference Include="Sentry" Version="3.8.3" />
<PackageReference Include="SharpCompress" Version="0.28.3" />
<PackageReference Include="NUnit" Version="3.13.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 00222877f1..c8d3d150db 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,8 +70,8 @@
<Reference Include="System.Net.Http" />
</ItemGroup>
<ItemGroup Label="Package References">
- <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.807.0" />
- <PackageReference Include="ppy.osu.Game.Resources" Version="2021.808.0" />
+ <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.810.0" />
+ <PackageReference Include="ppy.osu.Game.Resources" Version="2021.810.0" />
</ItemGroup>
<!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
<PropertyGroup>
@@ -93,7 +93,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="13.0.1" />
- <PackageReference Include="ppy.osu.Framework" Version="2021.807.0" />
+ <PackageReference Include="ppy.osu.Framework" Version="2021.810.0" />
<PackageReference Include="SharpCompress" Version="0.28.3" />
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="SharpRaven" Version="2.4.0" />