Merge ppy/master: 5 upstream commits (spectator preview, beatmap panel fixes, pen settings) - #285
Merged
Merged
Conversation
- depends on ppy/osu-framework#6737 Adds simple input settings section for pens that allows disabling the handler and adjusting sensitivity. The section appears in-between Tablet and Touch, and only on SDL3 (desktop and mobile). The pen sensitivity is completely independent from mouse sensitivity. <img width="537" height="149" alt="image" src="https://github.com/user-attachments/assets/448eebba-84ea-4daf-8428-3bd07739bd6f" /> <br> Keep in mind that the "Confine mouse cursor to window" mouse setting also affects pens, feel free to suggest UX improvements. Also, toggling "High precision mouse" might affect pens on certain configurations. Edit: added image with updated header. Previously, it was "Device: Pen". --------- Co-authored-by: Dean Herbert <pe@ppy.sh>
Different take to / supersedes / closes ppy#37550 Just going for minimal lines of code compared to the PR above, by reusing the quick play panel which is in a pretty good state. <img width="1298" height="864" alt="image" src="https://github.com/user-attachments/assets/409e163d-d7ea-4c07-874f-aaca7e145221" /> --------- Co-authored-by: Dean Herbert <pe@ppy.sh>
Regressed in ppy#37558, my bad.
Song preview keeps playing when clicking "Start Watching" on `SoloSpectatorScreen`. Making `SoloSpectatorScreen` suspends the screen rather than exiting it, so neither `clearDisplay()` nor `OnExiting()` fire. Closes: ppy#36987
I've seen this suggested quite a bit and is a pretty easy implementation all things considered. For now, while on the queue screen, you can open up the dashboard overlay and select another player to duel. This will bring you into an unranked lobby. https://github.com/user-attachments/assets/712897a9-9350-4741-899d-59662c722e43
…anel fix, results panel, pen settings) — fork takes precedence on conflicts Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>
Copilot created this pull request from a session on behalf of
winnerspiros
May 1, 2026 12:08
View session
winnerspiros
marked this pull request as ready for review
May 1, 2026 12:32
There was a problem hiding this comment.
Pull request overview
Merges 5 upstream ppy/master commits into the fork, primarily integrating the “stop song preview when entering spectator / leaving matchmaking flow” behavior while keeping fork resolutions for all conflicts.
Changes:
- Stop any playing preview track when
SoloSpectatorScreenis suspended (not only when exiting). - Adjust
ScreenQueuematchmaking lobby status handling / exit behavior during matchmaking queue screen lifecycle.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| osu.Game/Screens/Play/SoloSpectatorScreen.cs | Stops preview playback when the spectator screen is suspended. |
| osu.Game/Screens/OnlinePlay/Matchmaking/Queue/ScreenQueue.cs | Updates matchmaking lobby status subscription and exit flow behavior. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
|
|
||
| currentState.BindTo(queue.CurrentState); | ||
| currentState.BindValueChanged(s => SetState(s.NewValue)); | ||
| client.MatchmakingLobbyStatusChanged += onMatchmakingLobbyStatusChanged; |
Comment on lines
456
to
462
| switch (currentState.Value) | ||
| { | ||
| default: | ||
| return false; | ||
|
|
||
| case MatchmakingScreenState.Queueing: | ||
| client.MatchmakingLeaveLobby().FireAndForget(); | ||
| queue.SearchInBackground(); | ||
| return false; | ||
|
|
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.
Our fork was 5 commits behind
ppy/mastersince merge base662c85d4. Merged with--strategy-option=oursso winnerspiros fork wins all conflicts.Upstream commits pulled in
a3b8b9ae— Implement duels for ranked play3b84429e— Stop song preview when entering spectatorbc1c3d09— Fix beatmap panels not showing "downloaded" green strip71f841d8— Add beatmap panel to ranked play results screen9b3dba93— Add pen input settingsNet file changes
Only 2 files had actual content changes (the rest auto-merged or deferred to ours):
ScreenQueue.cs— spectator preview stop integrationSoloSpectatorScreen.cs— same featureConflicting files (
osu.Game.csproj,osu.Android.props,osu.iOS.props, config, multiplayer client) all retained our fork's versions.