osu-lazer

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 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 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 #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

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

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 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

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

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

Fix song select carousel sometimes teleporting on beatmap set deletion

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

The issue here does not reproduce consistently, and is more or less
random in presentation. That said, using a large enough realm database
more or less ensures that the issue will present itself (in testing on a
large realm db, the failure rate is around ~50%).

This actually regressed in https://github.com/ppy/osu/pull/34842. The
core failure in this case is here:

	https://github.com/ppy/osu/blob/fd412618dba7399b1778b0902b73ffbae21a2399/osu.Game/Screens/SelectV2/BeatmapCarousel.cs#L161

The `CheckModelEquality()` call above is comparing two `BeatmapInfo`s,
but a84c364e44 changed the
`BeatmapInfo`-comparing path of `CheckModelEquality()` to use
`GroupedBeatmap` instead. Due to this, `CheckModelEquality()` falls back
to reference equality comparison for `BeatmapInfo`s. When that reference
comparison fails, the carousel stops detecting that the current
selection was deleted from under it correctly, and therefore the
proximity-based selection logic never runs.

Due to the human-obvious mechanism of failure and relatively easy
manual reproduction I've decided not to try and add tests for this,
as they are likely to take a long time to write due to the mechanism
of failure being incorrect use of reference equality specifically. That
said, I can try on request.

Bartłomiej Dach · 2025-09-30 11:41:47 +02:00

a3e09a1c31

Avoid duplicating rank name colour constants

Bartłomiej Dach · 2025-09-29 09:44:05 +02:00

47b6b70cae

Adjust initial pool size for group rank displays

11 is excessive. There can ever be at most 9 of these panels, ever,
because there are at most 9 possible letter grades at this time (F, D,
C, B, A, S, S+, SS, SS+).

Bartłomiej Dach · 2025-09-29 09:42:36 +02:00

fd412618db

Avoid passing the same thing three times

Bartłomiej Dach · 2025-09-29 09:42:33 +02:00

9dc79e6f0d

Call a new panel style, when Rank Achieved grouping is picked

tadatomix · 2025-09-28 22:56:32 +03:00

33791318fe

Add a new Rank Achieved panel to BeatmapCarousel.cs

tadatomix · 2025-09-28 22:55:22 +03:00

cf20bbbf80

Add a separate panel for RankAchieved group

tadatomix · 2025-09-28 22:49:45 +03:00

55ef221390

Adjust matchmaking naming, namespaces, xmldoc (#35123 )

* Adjust matchmaking naming, namespaces, xmldoc

* Change partial filenames to use `.` instead of `_` separator

Dean Herbert · 2025-09-26 12:17:28 +09:00

e1ba1b45b0

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

Joseph Madamba · 2025-09-25 14:18:41 -07:00

ef88a3530a

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

829 Commits