Skip to content

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

Merged
winnerspiros merged 6 commits into
masterfrom
copilot/merge-ppy-updates-with-our-fork
May 21, 2026
Merged

Merge latest ppy/master (4 commits) while preserving fork-preferred conflict resolution#346
winnerspiros merged 6 commits into
masterfrom
copilot/merge-ppy-updates-with-our-fork

Conversation

Copilot AI commented May 21, 2026

Copy link
Copy Markdown
  • Inspect latest failed CI workflow run and collect failing job logs
  • Reproduce baseline state locally before edits
  • Fix compile error in multiplayer participant panel
  • Fix code-style errors (IDE0031) in multiplayer tests
  • Re-run targeted build/style checks locally
  • Re-run CI validation tooling and summarize remaining issues

peppy and others added 5 commits May 21, 2026 08:38
…` 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?).
…y#37795)

Closes ppy#37723

---------

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
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>
@gitar-bot

gitar-bot Bot commented May 21, 2026

Copy link
Copy Markdown

Gitar is working

Gitar

Agent-Logs-Url: https://github.com/winnerspiros/osu/sessions/d825f8ce-9334-4f69-94c3-e55a5c9b1871

Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>
Copilot AI requested a review from winnerspiros May 21, 2026 13:12
@winnerspiros
winnerspiros marked this pull request as ready for review May 21, 2026 13:56
Copilot AI review requested due to automatic review settings May 21, 2026 13:56
@winnerspiros
winnerspiros merged commit abb3c4c into master May 21, 2026
13 of 22 checks passed

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants