17764 Commits

• Quick play forward design work (#35253)

  * Remove unnecessary information from matchmaking beatmap panel
  
  * Move avatar overlay inside card for better layout
  
  * Allow higher jumping when jumping in succession
  
  * Exclude player panel avatars from masking
  
  * Adjust player panel animations a bit further
  
  * Add avatar-only display mode
  
  * Fix round warmup test not working
  
  * Remove dead test scenes
  
  * Fix edge case where users are added to not-yet-loaded card
  
  * Decouple `PlayerPanel` from `UserPanel`
  
  * Fix remaining test failure (and rename test to match new naming)

  Dean Herbert · 2025-10-13 13:28:09 +09:00
  8e36533f65
• Merge pull request #35252 from bdach/song-select-present-sometimes-fails

  Fix wrong beatmap shown when presenting a beatmap from results screen

  Dean Herbert · 2025-10-10 14:54:50 +09:00
  1f2928bf2f
• Merge pull request #35240 from bdach/song-select-preserve-selection-on-update-attempt-3

  Fix song select V2 not preserving selection after an update operation

  Dean Herbert · 2025-10-09 17:30:28 +09:00
  52f82c7e56
• Fix wrong beatmap shown when presenting a beatmap from results screen

  - Closes https://github.com/ppy/osu/issues/35023.
  - Supersedes / closes https://github.com/ppy/osu/pull/35107.

  Bartłomiej Dach · 2025-10-09 09:52:22 +02:00
  b477790d3e
• Fix carousel sometimes crashing when attempting to select next random set

  I'm not exactly sure on the reproduction scenario here, but I have had
  switching ruleset with converts disabled crash on me a few times
  today. It appears to happen sometimes when after the switch the expanded
  group no longer exists in the set mapping, because a filter just ran and
  removed that group from set of possible groups because there'd be no
  beatmaps under it.
  
  I tried to manufacture a quick test but it's not a quick one to test
  because filtering intereference is required to reproduce, I think.
  I will try again on request but I mostly just want to get this fix out
  ASAP before I finish up for the day.

  Bartłomiej Dach · 2025-10-08 15:13:00 +02:00
  7b1e3cd537
• Fix song select V2 not preserving selection after an update operation

  Because the detached store exists and has a chance to actually
  semi-reliably intercept a beatmap update operation, I decided to try
  this. It still uses a bit of a heuristic in that it checks for
  transactions that delete and insert one beatmap each, but probably the
  best effort thus far?
  
  Notably old song select that was already doing the same thing locally to
  itself got a bit broken by this, but with some tweaking that *looks* to
  be more or less harmless I managed to get it unbroken. I'm not too
  concerned about old song select, mind, mostly just want to keep it
  *vaguely* working if I can help it.

  Bartłomiej Dach · 2025-10-08 14:42:26 +02:00
  30412ba3f2
• Fix current beatmap set being incorrectly expanded after collapsing group with current selection

  Noticed in passing. See preceding commit for failure scenario.
  
  Regressed in https://github.com/ppy/osu/pull/35163.

  Bartłomiej Dach · 2025-10-08 13:42:43 +02:00
  9ba9966078
• Merge pull request #35216 from diquoks/quick-fix/mods-deselection-diff

  Fix mods deselection difference

  Dean Herbert · 2025-10-07 18:38:40 +09:00
  533c61e719
• Invert conditional to read a bit better
  Dean Herbert · 2025-10-07 18:07:58 +09:00
  64fba9470d
• Merge pull request #35221 from bdach/adjust-tag-threshold

  Adjust display tag threshold to match web

  Dean Herbert · 2025-10-06 20:57:26 +09:00
  19718c706a
• Fix hovering left area in song select not always activating reset action
  Dean Herbert · 2025-10-06 18:23:33 +09:00
  df58dc0ca2
• Adjust display tag threshold to match web

  Follow-up to https://github.com/ppy/osu-web/pull/12381 - tags will glow
  green starting from 5 votes rather than 10 to match the new threshold
  web-side.

  Bartłomiej Dach · 2025-10-06 11:09:54 +02:00
  b286f05c78
• Merge pull request #35185 from nekodex/matchmaking-more-sfx

  Yet more matchmaking SFX work

  Dean Herbert · 2025-10-06 18:04:22 +09:00
  b3ed7717a8
• Delay round increment sound to match animation better
  Dean Herbert · 2025-10-06 18:03:53 +09:00
  bc7e02c30b
• Merge branch 'master' into song-select-reselect-group-for-selection-when-moving-left
  Dean Herbert · 2025-10-06 16:57:57 +09:00
  8a450563fd
• Merge pull request #35176 from bdach/local-modified-beatmap-regressions

  Fix a few issues regarding incorrect treatment of locally-modified beatmaps

  Dean Herbert · 2025-10-06 16:22:09 +09:00
  dd846dcc52
• Merge pull request #35178 from bdach/song-select-loses-selection-if-convert

  Fix selection being changed on re-entering song select when a converted beatmap is selected

  Dean Herbert · 2025-10-06 15:53:42 +09:00
  71ae1d34cd
• Merge pull request #35199 from peppy/editor-timing-panel-current-row-visibility

  Adjust colouring to make current row in timing visualisation more obvious

  Bartłomiej Dach · 2025-10-06 08:39:05 +02:00
  dd8dfc04b3
• Merge pull request #35188 from bdach/song-select-do-not-flash-wrong-leaderboard

  Fix wrong leaderboard flashing briefly when quickly changing beatmaps

  Dean Herbert · 2025-10-06 14:43:33 +09:00
  e76d1ae619
• Fix mods deselection difference
  Denis Titovets · 2025-10-06 01:58:49 +03:00
  dbd48bc3a1
• Adjust colouring to make current row in timing visualisation more obvious
  Dean Herbert · 2025-10-04 16:13:48 +09:00
  a2770a8674
• Fix wrong leaderboard flashing briefly when quickly changing beatmaps

  Closes https://github.com/ppy/osu/issues/33743.

  Bartłomiej Dach · 2025-10-03 12:35:58 +02:00
  a30c7f51d0
• Code style fixes
  Jamie Taylor · 2025-10-03 18:04:55 +09:00
  4e90a2aee2
• Change 'quick play' button to use the 'daily' sample for now
  Jamie Taylor · 2025-10-03 17:17:23 +09:00
  e24df0b9d0
• Add SFX for round transitions
  Jamie Taylor · 2025-10-03 17:16:45 +09:00
  27ff2a7d49
• Rework StageDisplay SFX
  Jamie Taylor · 2025-10-03 17:16:21 +09:00
  3cb85f743a
• Add SFX for enqueueing and also a looping 'waiting' SFX when in certain matchmaking states
  Jamie Taylor · 2025-10-03 17:10:52 +09:00
  43878f6d33
• Add ducking effect on match found
  Jamie Taylor · 2025-10-03 17:05:00 +09:00
  60dc2c8876
• Expand group that current selection resides in when moving mouse to left side of song select

  Closes https://github.com/ppy/osu/issues/33557.

  Bartłomiej Dach · 2025-10-03 09:27:05 +02:00
  87128453d6
• Attempt to scroll carousel to nearest expanded panel when the current selection is filtered out

  Addresses https://github.com/ppy/osu/issues/33443, maybe.
  
  I considered adding tests but they'd likely be janky and take a long
  time to write, so decided against until there's a demand for it.

  Bartłomiej Dach · 2025-10-02 14:28:39 +02:00
  007de10e2b
• Fix selection being changed on re-entering song select when a converted beatmap is selected

  Closes https://github.com/ppy/osu/issues/34062.
  
  The root cause of the issue is that `OnEntering()` calls
  `onArrivingAtScreen()`, which calls `ensureGlobalBeatmapValid()`, which
  would call `checkBeatmapValidForSelection()` with a `FilterCriteria`
  instance retrieved from the `FilterControl`.
  
  The problem with that is at the time that this call chain is happening,
  `FilterControl` is not yet loaded, which means in particular that it has
  not bound itself to the config bindable, as that happens on
  `LoadComplete()`:
  
  	https://github.com/ppy/osu/blob/bff07010d1f9874125baf2918f02c5cf61a5ea60/osu.Game/Screens/SelectV2/FilterControl.cs#L198
  
  To resolve this, retrieve the bindable in `SongSelect` itself, which
  ensures it is valid for reading at the time the above call chain
  happens.

  Bartłomiej Dach · 2025-10-02 13:27:43 +02:00
  3d5dc60cfe
• Do not attempt to retrieve score submission tokens for locally-modified beatmaps

  Because it is 99% sure that doing so will fail and spam the user with
  "this beatmap doesn't match the online version" notifications, and
  because the map status is "locally modified", they should be pretty
  aware of that already. This fixes the primary mode of the failure that
  https://github.com/ppy/osu/pull/35173 was attempting to hack around.
  
  This will have regressed somewhere around the time that BSS went live,
  because at that point the editor stopped resetting online IDs for
  beatmaps that got locally modified, making the `beatmapId <= 0` guards
  no longer prevent attempts of submission.

  Bartłomiej Dach · 2025-10-02 09:16:17 +02:00
  2a85f7b7c8
• Do not overwrite "locally modified" beatmap set status when performing online lookups in song select

  A relatively recent regression. It's maybe not a huge one, in that it
  probably doesn't matter all that much, but it is somewhat important to
  keep the "locally modified" status of the set for as long as possible.
  
  One reason for that is that keeping the "locally modified" status will
  pull up a dialog when the user attempts to update the beatmap, warning
  them that they will lose their local changes - this dialog will not show
  if the online lookup flow is allowed to overwrite the map status with
  something else.

  Bartłomiej Dach · 2025-10-02 09:16:15 +02:00
  365cdfd40e
• Fix clicking the osu! logo when in the multiplayer submenu opening solo play instead (#35175)
  Bartłomiej Dach · 2025-10-02 16:03:46 +09:00
  aad321a0b8
• Merge pull request #35154 from smoogipoo/matchmaking-events

  Add structure and support for jumping in quick play rooms

  Dean Herbert · 2025-10-02 13:57:00 +09:00
  37a11b5592
• Merge pull request #35169 from bdach/song-select-enter-on-filtered-out-carousel-should-start-map

  Fix pressing Enter not starting current global beatmap if carousel is fully filtered out

  Dean Herbert · 2025-10-01 23:44:01 +09:00
  565a2866ea
• Fix pressing Enter not starting current global beatmap if carousel is fully filtered out

  Closes https://github.com/ppy/osu/issues/34693.

  Bartłomiej Dach · 2025-10-01 14:31:48 +02:00
  9b78187d29
• Use consistent ordering of update button on carousel beatmap panels

  Closes https://github.com/ppy/osu/issues/34810.
  
  The reason why I touched it in this direction and not the other is only
  because the standalone panel positioning of the button was touched last
  in 92ed964627, thus I changed the set
  panel to match that.

  Bartłomiej Dach · 2025-10-01 13:49:54 +02:00
  ccf3151172
• Merge pull request #35126 from Joehuu/song-select-silver-terminology

  Use silver S/SS terminology when grouping by rank/grade in song select

  Bartłomiej Dach · 2025-10-01 13:30:50 +02:00
  b980183e98
• Merge pull request #35163 from bdach/carousel-stop-re-expanding-group

  Do not forcibly re-expand carousel groups on refilters if the user manually collapsed them

  Dean Herbert · 2025-10-01 16:33:59 +09:00
  345ae29770
• Use slightly safer method of converting to string
  Bartłomiej Dach · 2025-10-01 08:50:39 +02:00
  6bf589af88
• Merge branch 'master' into song-select-silver-terminology
  Bartłomiej Dach · 2025-10-01 08:32:07 +02:00
  03455ba683
• Merge pull request #35158 from bdach/fix-carousel-teleports-on-delete

  Fix song select carousel sometimes teleporting on beatmap set deletion

  Dean Herbert · 2025-10-01 15:16:26 +09:00
  1f7aa2fe5e
• Merge pull request #35160 from bdach/carousel-not-switching-beatmap-on-ruleset-change

  Fix song select not changing global beatmap correctly when switching rulesets

  Dean Herbert · 2025-10-01 13:47:08 +09:00
  5ab40e4b73
• Rename GetRankName to GetRankLetter
  Joseph Madamba · 2025-09-30 10:50:34 -07:00
  114e7f5c61
• Merge pull request #35161 from bdach/song-select-refetch-online-on-reenter

  Forcibly refetch online beatmap content on re-entering song select

  Dean Herbert · 2025-09-30 23:20:38 +09:00
  e2b9288716
• Merge pull request #35111 from smoogipoo/quick-play-keybinds

  Add keybinds to matchmaking queue screen

  Dean Herbert · 2025-09-30 23:19:33 +09:00
  919c47b918
• Do not forcibly re-expand carousel groups on refilters if the user manually collapsed them

  RFC. Closes https://github.com/ppy/osu/issues/35091.

  Bartłomiej Dach · 2025-09-30 15:24:48 +02:00
  bc4d5d07d7
• Forcibly refetch online beatmap content on re-entering song select

  Closes https://github.com/ppy/osu/issues/34546.

  Bartłomiej Dach · 2025-09-30 13:58:10 +02:00
  33ddb84633
• Fix song select not changing global beatmap correctly when switching rulesets

  Closes https://github.com/ppy/osu/issues/35113.
  
  Regressed in dfed564bda - setting
  `Carousel.CurrentSelection` was not all that
  `requestRecommendedSelection()` was doing there...
  
  A potential point of discussion is whether this global beatmap switch
  should be debounced or instant. I'm not sure I have a particularly
  well-formed opinion on that. One argument in favour of not debouncing is
  that if you look closely at the left side of the screen while the
  debounce is in progress, you can still sort of see the broken behaviour
  happen - it just doesn't stay there forever.
  
  Thankfully `ensureGlobalBeatmapValid()` being called in every scenario
  on screen suspension prevented this bug from being any worse than it is
  right now.

  Bartłomiej Dach · 2025-09-30 13:34:26 +02:00
  f66c8d10e0