792 Commits

• Improve FailRetryDisplay performance (#35101)
  Andrei Zavatski · 2025-09-24 15:53:16 +09:00
  57e5fe7265
• Adjust debounce again to handle key down state
  Dean Herbert · 2025-09-11 13:25:24 +09:00
  1ea17129cc
• Merge pull request #34966 from peppy/fix-carousel-thing

  Fix beatmap carousel not holding selection after refilter in some cases

  Bartłomiej Dach · 2025-09-10 10:31:22 +02:00
  1f4f6ce4fe
• Merge pull request #34910 from CloneWith/update/drawable-date

  Make DrawableDate formatting localizable

  Bartłomiej Dach · 2025-09-10 09:54:50 +02:00
  4d76c467f8
• Fix beatmap carousel not holding selection after refilter in some cases

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

  Dean Herbert · 2025-09-10 16:37:49 +09:00
  699892c6a2
• 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
• Merge pull request #34914 from bdach/error-on-exiting-editor

  Fix errors on exiting from editor if there are no more beatmaps remaining for the ruleset active in song select

  Dean Herbert · 2025-09-05 15:24:07 +09:00
  891b717b3d
• Merge pull request #34903 from peppy/song-select-better-debounce

  Fix song select debounce not handling long (stutter) frames well

  Dean Herbert · 2025-09-05 15:02:53 +09:00
  11e1c2d73f
• Fix broken reselection logic

  d4b357dfa0 contains a sneaky regression.
  The previous code read:
  
      if (CurrentSelection != null && CheckModelEquality(beatmap, CurrentSelection))
  	RequestSelection(matchingNewBeatmap);
  
  and the new one reads:
  
      if (CurrentSelection is GroupedBeatmap currentBeatmapUnderGrouping)
      {
  	var candidateSelection = currentBeatmapUnderGrouping with { Beatmap = beatmap };
  	if (CheckModelEquality(candidateSelection, CurrentSelection))
  	    RequestSelection(candidateSelection);
      }
  
  The point is that we want to reselect `matchingNewBeatmap` here, not the
  old selection. The `CheckModelEquality()` check's purpose is to check
  whether *the current selection needs updating*.
  
  I'm not sure why tests just wonderfully passed despite this, but my
  suspicion is that it was because of accidental copying of realm guids
  that obscured this problem.

  Bartłomiej Dach · 2025-09-04 13:11:31 +02:00
  134f854d7b
• Ensure that matching beatmap still exists when performing replace operation in the carousel
  Bartłomiej Dach · 2025-09-04 12:44:18 +02:00
  6e5bf57fe7
• 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
• Merge pull request #34904 from bdach/local-rank-includes-unproven-scores

  Treat guest user scores & scores of unknown users as the local user's

  Dean Herbert · 2025-09-04 17:06:51 +09:00
  f1d06f796a
• Make DrawableDate formatting localizable
  CloneWith · 2025-09-04 14:44:40 +08:00
  1c608e779d
• 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
• Extract helper method for retrieving all user local scores
  Bartłomiej Dach · 2025-09-03 12:05:02 +02:00
  0bbad3e1cd
• 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
• Simplify beatmap access in carousel panels
  Bartłomiej Dach · 2025-09-03 09:52:37 +02:00
  315eea8d9a
• Merge branch 'master' into carousel-multiple-copies-of-beatmap-clean
  Dean Herbert · 2025-09-03 15:35:03 +09:00
  566562240e
• Cancel underlying web request on local cancellation of lookup request
  Dean Herbert · 2025-09-01 18:00:52 +09:00
  9d0043d03b
• Fix cancellation token not actually being used
  Dean Herbert · 2025-09-01 18:00:52 +09:00
  0021434a62
• Fix rewind not working over grouping mode changes
  Bartłomiej Dach · 2025-08-29 14:42:32 +02:00
  4ffc262073
• Fix presenting individual beatmaps from main menu breaking

  In this case `CurrentSelection` is being set on the song select screen's
  `OnEntering()`, at which point grouping is not yet known.

  Bartłomiej Dach · 2025-08-29 13:45:27 +02:00
  2b52c1de0b
• Do not attempt to refresh group in current selection if grouping is not relevant
  Bartłomiej Dach · 2025-08-29 13:25:08 +02:00
  89492cbd81
• Fix stale group refresh logic inadvertently losing selection entirely sometimes
  Bartłomiej Dach · 2025-08-29 13:25:08 +02:00
  1bb24c923d
• 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 standalone beatmap panels not having the correct height
  Bartłomiej Dach · 2025-08-29 13:25:08 +02:00
  3cf0a9b9c0
• Fix changing group mode causing CurrentSelection to retain a stale GroupDefinition
  Bartłomiej Dach · 2025-08-29 13:25:08 +02:00
  107e103825
• 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
• Introduce new model for "beatmaps under grouping" & allow beatmaps to appear in multiple groups

  This bypasses the immediate first issue of not being able to display
  multiple instances of a beatmap on the carousel because of model
  equality being baked into the structure. It inevitably poses a bunch of
  *other* problems, but it's a start.

  Bartłomiej Dach · 2025-08-29 13:12:12 +02:00
  a84c364e44
• Make grouping by collections and rank achieved testable without involving realm
  Bartłomiej Dach · 2025-08-29 13:12:12 +02:00
  d304a31757
• Merge branch 'master' into online-lookups-on-reenter
  Dean Herbert · 2025-08-29 19:03:41 +09:00
  3ca5e20e70
• Merge branch 'master' into carousel-multi-grouping-clean
  Bartłomiej Dach · 2025-08-29 10:41:46 +02:00
  51ed19cb99
• Apply suggested rename
  Bartłomiej Dach · 2025-08-29 09:58:56 +02:00
  526ee32268
• 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
• Support beatmap sets being split apart by the active group mode in beatmap carousel
  Bartłomiej Dach · 2025-08-28 13:09:08 +02:00
  8dd131f17e
• Ensure filtering also runs after local gameplay LastPlayed changes
  Dean Herbert · 2025-08-28 19:10:20 +09:00
  7e109add96
• Merge branch 'master' into fix-difficulty-churn
  Dean Herbert · 2025-08-28 02:38:10 +09:00
  ed15e1fb88
• Fix hidden beatmap state not being reflected immediately
  Dean Herbert · 2025-08-28 02:33:18 +09:00
  8a6c857719
• Allow grouping modes that apply max aggregate to split beatmap sets apart
  Bartłomiej Dach · 2025-08-27 14:45:20 +02:00
  4030383276
• Apply in more places
  Dean Herbert · 2025-08-27 19:59:44 +09:00
  f9c1b24df4
• Fix beatmap panels locally handling mod changes unnecessarily

  The `BeatmapDifficultyCache` handles mod changes, so handling locally is
  unnecessary. By handling locally, it creates a visual issue when
  adjusting mods often. Test using Ctrl +/- at song select and observing
  that without this change, the star rating will flicker back to the
  default due to the local re-fetch.

  Dean Herbert · 2025-08-27 18:31:50 +09:00
  fda40d7fd5
• Fix beatmap carousel re-filtering when it doesn't need to

  Local rules ensure we only handle callbacks when we need to.

  Dean Herbert · 2025-08-27 18:21:19 +09:00
  be6fb9aa77
• Avoid triggering changes when add operations are empty

  Only seems to happen in tests. I think.

  Dean Herbert · 2025-08-27 18:13:13 +09:00
  0e57ee9ba6
• Work around excessive refreshes of carousel beatmap set panel backgrounds

  Closes https://github.com/ppy/osu/issues/34511 I guess.

  Bartłomiej Dach · 2025-08-26 13:27:54 +02:00
  c0fd5637de
• Fix song select favourite button potentially showing stale data from (un)favourite request callback
  Bartłomiej Dach · 2025-08-22 14:25:25 +02:00
  5292d4a04e