147 Commits

• Adjust debounce again to handle key down state
  Dean Herbert · 2025-09-11 13:25:24 +09:00
  1ea17129cc
• Adjust song select debounce to be high than repeat_initial_delay

  I'm doing this silently to see if any users complain without being told
  about the change. Without this, when holding left arrow for short
  bursts, precisely *one* beatmap change happens before actual key repeat
  kicks in, which feels really weird (updates the leaderboard / background
  unexpectedly).
  
  This is the simplest way to resolve the issue, so if users aren't
  offended by it I think we should commit to it.
  
  Personally it's still fast enough to not annoy me at all.

  Dean Herbert · 2025-09-09 19:11:50 +09:00
  2bd734918a
• Fix multiple concerns with new debounce logic

  Tried many approaches but this seems simplest to guarantee no test (or
  other) regressions..

  Dean Herbert · 2025-09-04 18:13:16 +09:00
  b0c7b6c700
• Change debounce consideration to use dynamic FPS moving average rather than fixed 60 fps

  This should better account for scenarios where user FPS is below 60 fps.
  Previously the debounce would unexpectedly be longer than usual for low
  FPS scenarios.

  Dean Herbert · 2025-09-04 02:19:28 +09:00
  b2501ae58f
• Merge branch 'master' into song-select-better-debounce
  Bartłomiej Dach · 2025-09-03 12:42:21 +02:00
  1ba403753c
• Fix song select debounce happening too early during fast iteration if there's a stutter
  Dean Herbert · 2025-09-03 18:55:47 +09:00
  4ec620c4a9
• Better document various debounce constants and split out processing debounce for clarity
  Dean Herbert · 2025-09-03 18:55:46 +09:00
  6ce76786ed
• Adjust song select debounce upwards slightly

  I still think it can probably go higher. Just going to do this in small
  increments until people complain / notice.

  Dean Herbert · 2025-09-03 18:55:46 +09:00
  b97cb65444
• Implement local song select debounce rather than using Scheduler.AddDelayed

  This is to allow more custom handling of the debounce timing.

  Dean Herbert · 2025-09-03 18:55:46 +09:00
  3e8775051e
• Hide object-typed CurrentSelection and expose strongly-typed alternatives instead
  Bartłomiej Dach · 2025-09-03 10:24:25 +02:00
  4a7ee6fafc
• Merge branch 'master' into carousel-multiple-copies-of-beatmap-clean
  Dean Herbert · 2025-09-03 15:35:03 +09:00
  566562240e
• Fix cancellation token not actually being used
  Dean Herbert · 2025-09-01 18:00:52 +09:00
  0021434a62
• Allow BeatmapCarousel.CurrentSelection to accept raw BeatmapInfos (and redirect to appropriate grouped beatmap)

  This is probably where things get a little controversial.
  
  There are some song select flows wherein song select just wants to
  ensure sanity by authoritatively setting the global beatmap. The goal is
  to change the beatmap immediately and instantly. Therefore it should
  kind of be the carousel's job to figure out its grouping complications.
  
  To that end, `CurrentSelection` is made virtual, and overridden in
  `BeatmapCarousel` to perform a sort of reconciliation logic. If an
  external component sets `CurrentSelection` to a `BeatmapInfo`, one of
  the two following things happen:
  
  - Nothing, if the current `GroupedBeatmap` is already a copy of the
    beatmap that needs to be selected, or
  
  - The carousel looks at its items, finds any first copy which matches
    the beatmap that the external consumer wanted selected, and changes
    selection to that instead.

  Bartłomiej Dach · 2025-08-29 13:25:08 +02:00
  dfed564bda
• Fix carousel selection not working

  Basically, `BeatmapCarousel.CurrentSelection`, which is
  magic-object-typed, can no longer use `BeatmapInfo` directly, it now
  must also use `GroupedBeatmap`.
  
  This spills out all the way into song select because of beatmap
  selection flows that require hookup from song select.

  Bartłomiej Dach · 2025-08-29 13:25:01 +02:00
  d4b357dfa0
• Fix song select not performing online lookup on re-enter

  Closes https://github.com/ppy/osu/issues/34825.
  
  Root cause is
  
  	https://github.com/ppy/osu/blob/24ec43b3b65fa3b164b7713341cd62b1e0dacc2e/osu.Game/Screens/SelectV2/SongSelect.cs#L345-L356
  
  not specifying `(..., true)`, therefore the fetch doesn't happen on
  enter if song select doesn't change the global beatmap as a side effect
  of the enter, which is the case on re-entering.

  Bartłomiej Dach · 2025-08-29 09:31:20 +02:00
  df6d6edaca
• Pull up online beatmap set lookup to song select level to avoid two components doing the same fetch independently
  Bartłomiej Dach · 2025-08-22 14:25:21 +02:00
  d3ae20dd88
• Fix song select background being stuck in revealed state

  Closes https://github.com/ppy/osu/issues/34731.
  
  The failure scenario here is as follows:
  
  - User holds down left mouse button for >200ms to reveal the background.
  - User presses down another mouse button and releases it in <200ms.
  - User releases left mouse button. Song select does not return.
  
  The timing here is key because what is happening here is that the second
  mouse button press is overwriting the `revealingBackground` scheduled
  delegate. Releasing that same mouse button within 200ms leads to that
  scheduled delegate being cancelled and cleared, and thus the release of
  left mouse wrongly decides there is nothing left to do.
  
  One thing I'm not entirely sure about is the release behaviour even with
  this change; as things stand, the first release of any mouse button will
  bring song select back, even if it was not the button that was initially
  held down to reveal the background. That's probably easily fixed if
  deemed required, but I'm most interested in fixing the bad breakage.

  Bartłomiej Dach · 2025-08-21 11:31:37 +02:00
  a7f1795f98
• Merge pull request #34625 from peppy/fix-song-select-event-feedback

  Fix selection being finalised immediately on beatmap updates arriving

  Bartłomiej Dach · 2025-08-12 14:57:01 +02:00
  734dea1be4
• Fix selection being finalised immediately on beatmap updates arriving
  Dean Herbert · 2025-08-12 20:22:37 +09:00
  4c734c2a0e
• Fix "reveal background" triggering in one more case it shouldn't

  Closes https://github.com/ppy/osu/issues/34393 again. Hopefully for the
  last time.

  Dean Herbert · 2025-08-12 17:20:35 +09:00
  086cdce94d
• Avoid reveal background triggering when more than left mouse button is involved

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

  Dean Herbert · 2025-08-04 18:30:08 +09:00
  d34c526717
• Move duck code to run before looping is setup
  Dean Herbert · 2025-08-04 17:45:39 +09:00
  9fa95ceabe
• Fade music back in when returning from song select from gameplay

  Addresses abrupt playback pointed out in
  https://github.com/ppy/osu/discussions/34472.
  
  In cases where the music is already playing, this isn't required (ie
  when returning from the player loading screen before gameplay starts).

  Dean Herbert · 2025-08-04 14:36:02 +09:00
  1d8885131e
• 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