Merge latest `ppy/master` (4 commits) while preserving fork-preferred conflict resolution - #346

Merged

winnerspiros merged 6 commits into

copilot/merge-ppy-updates-with-our-fork

May 21, 2026

Commits on May 21, 2026

Fix popup dialogs not appearing if pushed when `OverlayActivationMode` is wrong (#37838)
peppy
authored
5ad514c
Remove the ability to "Invite to room" and "Duel" in Ranked Rooms (#37795)

pacowoc
and
smoogipoo
authored
160bc26
Move configuration migrations to `OsuGame` (#37839)

peppy
and
Bartłomiej Dach
authored
f6cd5f8
Add client-side support for slots in multiplayer rooms (#37741)

Bartłomiej Dach
and
peppy
authored
4671d1f
Merge remote-tracking branch 'refs/remotes/upstream/master' into copilot/merge-ppy-updates-with-our-fork
Copilot
authored
26b39ec
fix: resolve multiplayer compile and style CI failures

Copilot
and
winnerspiros
authored
6678ece