Merge latest ppy/master (4 commits) while preserving fork-preferred conflict resolution - #346
Merged
Merged
Conversation
…` is wrong (ppy#37838) This change is a prerequisite for making a migration dialog which runs on startup to let users know that something hs changed. A few cases this could happen: - During start (intro still playing) - During gameplay Basically making dialogs get poofed without the user ever seeing them. Arguably, we should also change the way dialogs are still poofed when activation mode becomes not-`All` (deferring for later response rather than dismissing?).
As we go forward, migrations are going to likely become more complex, requiring access to more components and also at a point in time where they are ready. In the upcoming case, `DialogOverlay` and `Audio` are important. Access to `Audio` is a killer as migrations were run before the `GameHost` has a chance to initialise it. --------- Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
- Part of ppy/osu-server-spectator#405 <img width="1624" height="900" alt="Screenshot 2026-05-13 at 12 40 07" src="https://github.com/user-attachments/assets/a7f36d54-4cc6-49c9-8e89-ee0d049bb637" /> <img width="1624" height="900" alt="Screenshot 2026-05-13 at 12 31 40" src="https://github.com/user-attachments/assets/0c054dfd-addd-4d00-bbca-119b4c3ec3cb" /> Will not work until relevant server-side support is in. --- I was in two minds whether to PR this all at once or to PR only ppy@693e4ef to begin with to unblock server-side implementation. In the end I opted for one PR because usage informs the model, so I find everything else relevant as part of review of the model design. If there are concerns about this making it into a release without server-side support and therefore things looking broken I will split the commit out on request. I put in some effort to add relevant logic in test multiplayer client to simulate the server side but I may well have missed something. --------- Co-authored-by: Dean Herbert <pe@ppy.sh>
…lot/merge-ppy-updates-with-our-fork Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>
Copilot created this pull request from a session on behalf of
winnerspiros
May 21, 2026 12:56
View session
Agent-Logs-Url: https://github.com/winnerspiros/osu/sessions/d825f8ce-9334-4f69-94c3-e55a5c9b1871 Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>
winnerspiros
approved these changes
May 21, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.