124 Commits

• Merge pull request #34450 from bdach/fix-song-select-dropping-sort-mode

  Ensure scores are re-fetched with correct criteria on re-entering song select

  Dean Herbert · 2025-08-02 02:05:47 +09:00
  98acd9ee11
• Add support for grouping beatmaps by collections

  Takes changes in https://github.com/ppy/osu/pull/34233 and removes *all*
  of the complexity.
  
  Supersedes and closes #34233.
  
  Contains same caveat that we can only display one beatmap once in the
  carousel; this will be addressed separately.

  Dean Herbert · 2025-08-01 16:23:26 +09:00
  c3396a93a6
• Ensure scores are re-fetched with correct criteria on re-entering song select

  Closes https://github.com/ppy/osu/issues/34445.
  
  The primary issue is that song select is the only one that supports
  non-score sort mode, and therefore if any other component changes the
  sort mode in a way opaque to song select to score, then song select will
  lose the sort mode because it's using the global leaderboard manager's
  state which will contain scores sorted by total.
  
  Notably, the bug this is fixing requires specific circumstances. For
  instance, it is not enough to just *start gameplay* for the bug to
  manifest, because starting gameplay causes a working beatmap refetch:
  
  https://github.com/ppy/osu/blob/4b73afd1957a9161e2956fc4191c8114d9958372/osu.Game/Screens/SelectV2/SongSelect.cs#L456-L457
  
  which will trigger a *delayed schedule refetch* of the scores:
  
  https://github.com/ppy/osu/blob/d2d3d14f1572ff8fc68fd01ea43c2ef68b5882fa/osu.Game/Screens/SelectV2/BeatmapLeaderboardWedge.cs#L235-L253
  
  and because the refetch is thusly delayed, there's a very high chance it
  *will not run before the screen is resumed* because the wedge will not
  have its scheduler run until that point in time.
  
  This conundrum is also because there is no test coverage for this,
  because the above makes test coverage setup rather annoying.

  Bartłomiej Dach · 2025-07-31 10:09:07 +02:00
  d176ce7916
• Merge branch 'master' into ssv2-localisation
  Denis Titovets · 2025-07-25 11:36:52 +03:00
  4b73afd195
• Add note about why we don't always restart on resuming
  Dean Herbert · 2025-07-24 13:25:06 +09:00
  07137f353f
• Fix present beatmap audio start at the preview point
  eyhn · 2025-07-23 22:29:07 +08:00
  e55a9e486b
• Merge pull request #34231 from bdach/user-tag-search-wip

  Add initial support for filtering by user tags in song select

  Dean Herbert · 2025-07-21 14:52:47 +09:00
  b4466aa7a2
• Merge branch 'master' into ssv2-localisation
  Denis Titovets · 2025-07-17 08:27:36 +03:00
  ca7eedaf6e
• Adjust song select spatial division one more time
  Dean Herbert · 2025-07-17 11:42:59 +09:00
  dd5925d119
• Add initial support for filtering by user tags in song select

  The way that this works is that it plugs into the online request to
  retrieve the beatmap set that the client is already performing, and
  stores user tag data to the local realm database.
  
  This means that for now user tags will only populate for beatmaps that
  the user has displayed on song select which is obviously subpar. I plan
  to follow this change up by adding user tag state dumps to `online.db`
  and using that data for initial tag population to make the majority case
  (ranked beatmaps) work.
  
  Note that several decisions were made here that are potential discussion
  points:
  
  - `RealmPopulatingOnlineLookupSource` is set up such that it can be the
    middle man / redirection point for similar flows that we need and we
    are currently missing, such as storing guest difficulty information,
    or storing the user's current best score on a beatmap (handy for rank
    achieved sorting / filtering / etc.)
  
  - The user tags are stored in `BeatmapMetadata` which breaks the
    longstanding assumption that you can arbitrarily pull out a metadata
    instance from any of the beatmaps in a set and get essentially the
    same object back.
  
    I've attempted to constrain this some by not adding user tags to
    the `IBeatmapMetadataInfo` interface through which `BeatmapSetInfo`
    exposes metadata further, but I warn in advance that this is
    a temporary state of affairs and I will make it worse in the future
    when `BeatmapMetadata.Author` becomes `Authors` plural in order to
    support guest mapper display (and direct guest difficulty submission).
  
  - The syntax for searching via user tags is chosen to mostly match web -
    it's `tag=`, with support for all of the string matching modes song
    select already has (bare word for substring, `""` quotes for phrase
    isolated by whitespace, `""!` for exact full match).

  Bartłomiej Dach · 2025-07-15 11:09:40 +02:00
  8cb81974eb
• Merge branch 'master' into ssv2-localisation
  Denis Titovets · 2025-07-12 10:37:17 +03:00
  0065331659
• Adjust song select sizing in response to user feedback

  Special casing for very wide, old-ish (initial ssv2 preview) sizing for
  others.

  Dean Herbert · 2025-07-11 20:09:45 +09:00
  ec0baaaba9
• Simplify post-hide selection
  Dean Herbert · 2025-07-10 21:08:57 +09:00
  acdd246518
• Use new finalise selection method instead of inlined code doing the same thing
  Dean Herbert · 2025-07-10 18:32:43 +09:00
  9240c61dee
• Ensure adjacent selection when currently selected beatmap is hidden
  Dean Herbert · 2025-07-10 17:46:10 +09:00
  44bbb7f029
• Remove duplicate `LocalisableString's
  Denis Titovets · 2025-07-09 16:31:51 +03:00
  7c9c2061ad
• Fully localise SSV2
  Denis Titovets · 2025-07-09 15:07:07 +03:00
  1f052bb195
• Adjust carousel sizing to better accommodate to ultra-wide-screen displays

  Roughly matches old song select now at widescreen resolutions. Does not
  change things much at standard 16:9 / 16:10.

  Dean Herbert · 2025-07-04 16:21:57 +09:00
  0715ed5e2e
• Unblur when revealing background
  Dean Herbert · 2025-07-04 11:59:43 +09:00
  d54fdce5c7
• Add back background blur support in song select v2

  Looks like shit, but whatever. Defaults to `false` for all new installs
  because it looks stupid.

  Dean Herbert · 2025-07-03 12:45:48 +09:00
  b06fd979fd
• Merge pull request #33970 from peppy/song-select-v2-default

  Make Song Select v2 the new default

  Bartłomiej Dach · 2025-07-02 09:10:01 +02:00
  e270be6e7a
• Remove comment referencing removed line
  Dean Herbert · 2025-07-02 14:47:22 +09:00
  08a3edcb5c
• Change audio ducking at song select v2 to be temporary to avoid conflict with overlays

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

  Dean Herbert · 2025-07-01 18:58:15 +09:00
  142984c07f
• Remove incorrectly placed ensureGlobalBeatmapValid call

  This is being run in the flow where we are providing a specific beatmap
  for immediately selection. In an edge case scenario, the carousel may be
  pending on a filter operation, which would cause the whole `SelectAndRun`
  call to fail when it doesn't need to.
  
  This is reproduced by multiple test scenes. One example is
  `TestSceneOpenEditorTimestamp.TestErrorNotifications`.

  Dean Herbert · 2025-07-01 17:25:39 +09:00
  94d6260d9b
• Update existing tests to work with Song Select v2
  Dean Herbert · 2025-07-01 17:25:38 +09:00
  397b9b3994
• Play error sound when random selection fails
  Dean Herbert · 2025-06-30 16:20:32 +09:00
  bf8b6754dc
• Rewrite and add commentary to selection debounce logic

  Hopefully a bit easier to maintain going forward? Not sure.

  Dean Herbert · 2025-06-25 17:58:54 +09:00
  49a9652fa5
• Merge pull request #33773 from peppy/fix-carousel-random-not-respecting-group

  SongSelectV2: Refine random selection to currently open group (and support difficulty split panels better)

  Bartłomiej Dach · 2025-06-24 14:37:09 +02:00
  a797c46d75
• Add localisation to Collections string on SongSelect
  diquoks · 2025-06-21 14:05:20 +03:00
  3192eaa2a2
• Fix global beatmap validity potentially being checked on a stale beatmap

  Noticed in a flaky test with the changes to random, where the debounce
  may be delayed to the point of thinking the selection is invalid even
  though it's valid (timing woes, I cannot explain in words but I would
  highly recommend smiling and nodding approach).

  Dean Herbert · 2025-06-19 17:29:42 +09:00
  873d622918
• Fix skin layer not hiding when revealing background
  Dean Herbert · 2025-06-17 14:41:27 +09:00
  36b5da3bd0
• Fix carousel drags being incorrectly handled as background reveal
  Dean Herbert · 2025-06-12 16:48:29 +09:00
  968b5b0082
• Disable when using touch input
  Dean Herbert · 2025-06-11 22:28:50 +09:00
  fc5ea7f3f2
• Add ability to reveal background when long pressing in empty space

  As touched on in https://github.com/ppy/osu/discussions/33624.
  
  Maybe fine as a bit of an easter egg?

  Dean Herbert · 2025-06-11 17:19:33 +09:00
  edf62baae8
• Remove logo scale when mod select appears

  This was causing the logo to not be clickable immediately after closing
  the overlay, which was reported as frustrating by some user.
  
  I hoped to fix this by unfuckulating the logo logic but it's a multi-day
  excursion that I'd rather avoid for now.

  Dean Herbert · 2025-06-10 12:38:24 +09:00
  3fbfa4b3f4
• Adjust max sizing at song select slightly
  Dean Herbert · 2025-06-09 17:31:58 +09:00
  4895f678a9
• Fix clicking beatmap header causing leaderboard to refresh
  Dean Herbert · 2025-06-06 23:30:36 +09:00
  ed2889c983
• Merge pull request #33418 from minetoblend/feature/ssv2-animated-ghost

  SongSelectV2: Animate placeholder ghost

  Dean Herbert · 2025-06-05 16:12:49 +09:00
  278a372a90
• Adjust background fade for placeholder to run faster
  Dean Herbert · 2025-06-05 14:55:18 +09:00
  64d9868ddf
• Fix beatmap changes handling when song select is not active
  Dean Herbert · 2025-06-05 03:49:00 +09:00
  e35d0f8953
• Fix wedge pieces disappearing when they shouldn't
  Dean Herbert · 2025-06-04 19:51:46 +09:00
  d79de43a29
• Avoid showing wedge until a valid beatmap is selected
  Dean Herbert · 2025-06-04 17:39:22 +09:00
  8842f935f1
• Fix audio not correctly continuing on resuming from gameplay
  Dean Herbert · 2025-06-04 17:39:22 +09:00
  f086be9c18
• Ensure we use valid criteria when attempting to select a beatmap

  `OnEntering` runs before `FilterControl.LoadComplete` meaning that
  `BeatmapCarousel` doesn't have filter populated yet...

  Dean Herbert · 2025-06-04 17:36:44 +09:00
  c009d4d03c
• Move state updates to separate method and flow
  Dean Herbert · 2025-06-04 15:45:40 +09:00
  4fcdfa2cfc
• Ensure valid ruleset for gameplay
  Dean Herbert · 2025-06-04 15:45:40 +09:00
  c73ef15ebf
• SongSelectV2: Simplify and standardise selection logic

  Before attempting to fix issues with invalid selections reaching
  gameplay, I needed to do a pass of the song select class as selection
  logic was already more complex than I'd hope.
  
  All operations now go through a single flow (`SelectAndRun`) when
  leaving the song select screen in a "success" state.

  Dean Herbert · 2025-06-04 15:45:40 +09:00
  12d3952905
• SongSelectV2: Fix background dim not being applied correctly when returning to screen
  Dean Herbert · 2025-06-03 15:20:46 +09:00
  21c06a7fbd
• De-duplicate logic which is applies when arriving/leaving song select

  Standardises all the logic which is applied in both directions –
  entering/resuming and suspending/exiting.

  Dean Herbert · 2025-06-03 15:20:09 +09:00
  7af6acb17f
• Merge branch 'master' into song-select-v2-polish-3
  Bartłomiej Dach · 2025-06-02 10:00:06 +02:00
  42ab6fbcb3