Skip to content

Merge upstream ppy/osu master (3 commits) — prioritize winnerspiros fork #314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
winnerspiros merged 5 commits into from
May 8, 2026
Merged

Merge upstream ppy/osu master (3 commits) — prioritize winnerspiros fork #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6f46be1
Update framework
peppy May 8, 2026
397b220
Fix missing uncommitted change
peppy May 8, 2026
458a27c
Remove unused variable
peppy May 8, 2026
a2a83ba
Merge remote-tracking branch 'upstream/master' into copilot/merge-pri…
Copilot May 8, 2026
7c2ec32
chore: bump framework to winnerspiros 2026.508.3 (run #44, GC pressur…
Copilot May 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion osu.Android.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ppy.osu.Framework.Android" Version="2026.508.2" />
<PackageReference Include="ppy.osu.Framework.Android" Version="2026.508.3" />
<!-- `ppy.osu.Framework.NativeLibs` is a transitive dependency of `ppy.osu.Framework`
that ships desktop-only natives (Linux/macOS/Windows) under `runtimes/<rid>/native/`
— including a bare Linux `libbass.so`/`libbass_fx.so`/`libbassmix.so` for linux-arm64.
Expand Down
4 changes: 0 additions & 4 deletions osu.Game.Tests/Skins/TestSceneBeatmapSkinLookupDisables.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
using osu.Framework.Graphics.Textures;
using osu.Framework.Testing;
using osu.Game.Audio;
using osu.Game.Configuration;
using osu.Game.Rulesets.Osu;
using osu.Game.Skinning;
using osu.Game.Tests.Beatmaps;
Expand All @@ -30,9 +29,6 @@ public partial class TestSceneBeatmapSkinLookupDisables : OsuTestScene
private BeatmapSkinSource beatmapSource;
private SkinRequester requester;

[Resolved]
private OsuConfigManager config { get; set; }

[SetUp]
public void SetUp() => Schedule(() =>
{
Expand Down
2 changes: 1 addition & 1 deletion osu.Game/osu.Game.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Realm" Version="20.1.0" />
<PackageReference Include="ppy.osu.Framework" Version="2026.508.2" />
<PackageReference Include="ppy.osu.Framework" Version="2026.508.3" />
<!--
Explicitly pin `ppy.Veldrid.SPIRV` to the winnerspiros fork build that
`ppy.osu.Framework 2026.507.1` was compiled against.This version is the only
Expand Down
2 changes: 1 addition & 1 deletion osu.iOS.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@
<SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ppy.osu.Framework.iOS" Version="2026.508.2" />
<PackageReference Include="ppy.osu.Framework.iOS" Version="2026.508.3" />
</ItemGroup>
</Project>
Loading