Skip to content

Merge latest 5 commits from ppy/master while preserving fork behavior on conflicts - #349

Merged
winnerspiros merged 9 commits into
masterfrom
copilot/merge-ppy-commits-prioritize-fork
May 23, 2026
Merged

Merge latest 5 commits from ppy/master while preserving fork behavior on conflicts#349
winnerspiros merged 9 commits into
masterfrom
copilot/merge-ppy-commits-prioritize-fork

Conversation

Copilot AI commented May 22, 2026

Copy link
Copy Markdown
  • Inspect latest failed CI workflow runs and collect failing job logs
  • Identify current root cause (CommonStrings.ButtonsClear unresolved in FormFileSelector)
  • Switch FormFileSelector to the correct CommonStrings namespace/source
  • Re-check CI warnings context and ensure they are downstream-only
  • Run parallel validation (Code Review + CodeQL)

peppy and others added 6 commits May 22, 2026 08:00
Internal offset adjust is based on [survey
results](https://docs.google.com/forms/d/1bWdwN9LPB4dJsqh2NO4z0HBiMiod1k8-tJN5oca-1Iw/edit)
results (mean: 17.95, median: 24.5) with slight skewing based on
cherry-picking results and personal experiences.

For users which have had the setting disabled:

<img width="1380" height="774" alt="osu! 2026-05-21 at 09 19 06"
src="https://github.com/user-attachments/assets/0526517a-fa0b-485b-ac1b-b61b2fccd2af"
/>

For users which are already using it:

<img width="1380" height="774" alt="osu! 2026-05-21 at 09 20 24"
src="https://github.com/user-attachments/assets/1bd77b39-5d75-43e8-8fe1-b324064b25fa"
/>

Note the button is intentionally hidden to avoid any confusion (it's
inverse now, so some users may mistakenly click it). Assume if a user is
already on the new engine, they are happy with it.

Test migration dialog in startup game flow using:

```diff
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 4bd5ab8..091af6d428 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -1315,6 +1315,8 @@ protected override void LoadComplete()
         /// </remarks>
         private void applyConfigMigrations()
         {
+            dialogOverlay.Push(new MigrateNewAudioDialog(true));
+
             // arrives as 2020.123.0-lazer
             string rawVersion = LocalConfig.Get<string>(OsuSetting.Version);
 

```

---------

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
https://github.com/user-attachments/assets/bc329cca-dfa1-4149-9760-121626cf1cb4

---

- Closes ppy#36326

Currently lacks the ability to specify custom video offset that isn't
manual .osu editing (defaults to 0) but I'm starting here and listening
to requirements.

---------

Co-authored-by: Dean Herbert <pe@ppy.sh>
- Part of ppy#14238 (doesn't close,
because the property doesn't do anything yet).
- Supersedes / closes ppy#37467.
They were shockingly small.

| Before | After |
| :---: | :---: |
| <img width="1358" height="601" alt="osu! 2026-05-22 at 08 19 27"
src="https://github.com/user-attachments/assets/4e3ea756-2970-4b7a-b59d-0e684d5bfe49"
/> | <img width="1358" height="601" alt="osu! 2026-05-22 at 08 17 23"
src="https://github.com/user-attachments/assets/f0ce6385-6da8-4cb3-837c-0199f0034529"
/> |
| <img width="1358" height="601" alt="osu! 2026-05-22 at 08 19 34"
src="https://github.com/user-attachments/assets/97bb06ed-4563-4fbc-a897-490abb593151"
/> | <img width="1358" height="601" alt="osu! 2026-05-22 at 08 17 16"
src="https://github.com/user-attachments/assets/294a14f9-09b5-480a-a383-15d82bde1aa0"
/> |
…its-prioritize-fork

Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>
@gitar-bot

gitar-bot Bot commented May 22, 2026

Copy link
Copy Markdown

Gitar is working

Gitar

Copilot AI requested a review from winnerspiros May 22, 2026 13:58
Agent-Logs-Url: https://github.com/winnerspiros/osu/sessions/e6082aeb-9082-4038-8ea9-4bd898edac78

Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>
Agent-Logs-Url: https://github.com/winnerspiros/osu/sessions/ab2ee4ea-fd9a-4375-ae5f-14317e61a903

Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>
Copilot AI requested a review from winnerspiros May 23, 2026 05:46
@winnerspiros
winnerspiros marked this pull request as ready for review May 23, 2026 06:07
Copilot AI review requested due to automatic review settings May 23, 2026 06:07
@winnerspiros
winnerspiros merged commit dddab34 into master May 23, 2026
12 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.

5 participants