75266 Commits

This Branch

This Branch

All Branches

• Merge pull request #34836 from bdach/online-lookups-on-reenter

  Fix song select not performing online lookup on re-enter

  Dean Herbert · 2025-08-29 21:21:34 +09:00
  1d9de88aaa
• Add failing test for rewind not working over grouping mode changes
  Bartłomiej Dach · 2025-08-29 14:06:53 +02:00
  a27fef2437
• 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 obvious test failures from using GroupedBeatmap in BeatmapCarousel.CurrentSelection
  Bartłomiej Dach · 2025-08-29 13:25:08 +02:00
  3f637db391
• 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
• Apply most trivial adjustments to tests after beatmap model replacement
  Bartłomiej Dach · 2025-08-29 13:22:37 +02:00
  e98579d3af
• 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
• Add baseline test exercising desired duplicated display
  Bartłomiej Dach · 2025-08-29 13:12:12 +02:00
  2ed79d354c
• 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 pull request #34822 from bdach/carousel-multi-grouping-clean
  Dean Herbert · 2025-08-29 19:02:58 +09:00
  404044e8d7
• Merge pull request #34830 from minetoblend/fix/hitobject-lifetime-delay

  Fix hitobject drawables becoming visible 1 frame too late

  Dan Balasescu · 2025-08-29 18:38:24 +09:00
  d5575b4037
• Move footer to ScreenTestScene
  Dan Balasescu · 2025-08-29 17:49:48 +09:00
  04ba5aa575
• Merge branch 'master' into carousel-multi-grouping-clean
  Bartłomiej Dach · 2025-08-29 10:41:46 +02:00
  51ed19cb99
• Fix tournament test failure due to control change
  Dean Herbert · 2025-08-29 17:12:24 +09:00
  0a408a3ac4
• Merge pull request #34833 from peppy/fix-mod-cosmetics

  Fix some mods showing tooltips when settings are default

  Dean Herbert · 2025-08-29 17:09:01 +09:00
  22ba956f25
• 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
• Merge pull request #34834 from peppy/tournament-warmup-better

  Use switches for warmup/chat toggles in tournament interface

  Bartłomiej Dach · 2025-08-29 09:09:20 +02:00
  24ec43b3b6
• Fix obviously incorrect conditional

  Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>

  Dean Herbert · 2025-08-29 16:01:49 +09:00
  9e77a5b050
• Use switches for warmup/chat toggles in tournament interface

  As proposed in https://github.com/ppy/osu/discussions/32515.

  Dean Herbert · 2025-08-29 14:35:42 +09:00
  12832e9fef
• Fix some mods showing tooltips when settings are default
  Dean Herbert · 2025-08-29 14:08:18 +09:00
  e83f3d5e77
• Return early to avoid creating mod description strings unnecessarily
  Dean Herbert · 2025-08-29 14:08:06 +09:00
  f2f5cf19a2
• Fix operations in PooledDrawableWithLifetimeContainer.CheckChildrenLife being in wrong order

  Previously CompositeDrawable.CheckChildrenLife() would be run before lifetimeManager.Update() which lead to the new drawables being inserted into the container but not being made alive immediately, leading to the drawable not becoming visibile until the next update loop.

  marvin · 2025-08-28 23:36:29 +02:00
  bb9f9e4d35
• Merge pull request #34774 from genskyff/feat/long-note-ratio

  Add long note percentage filter for mania mode

  Bartłomiej Dach · 2025-08-28 14:32:52 +02:00
  6e1316241a
• Merge pull request #34808 from peppy/fix-difficulty-churn

  Fix beatmap carousel triggering full filters more often than it needs to

  Bartłomiej Dach · 2025-08-28 14:26:25 +02:00
  3eaa5314ac
• Adjust tests to new beatmap set model usage in carousel
  Bartłomiej Dach · 2025-08-28 13:09:11 +02:00
  6ba72fa481
• 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 pull request #34740 from bdach/maximised-player-audio

  Always use audio from maximised player if there is one in multiplayer spectator

  Dean Herbert · 2025-08-28 18:27:56 +09:00
  f953d58922
• Add failing test coverage of splitting beatmap sets apart
  Bartłomiej Dach · 2025-08-28 11:00:23 +02:00
  47164c61b4
• Adjust test after allowing grouping modes to split beatmap sets apart
  Bartłomiej Dach · 2025-08-28 11:00:23 +02:00
  311c75aa53
• Merge pull request #34818 from smoogipoo/completion-handler-override

  Preserve pre-post notification completion target

  Dean Herbert · 2025-08-28 14:10:59 +09:00
  0b40f1d0db
• Configure await calls
  Dan Balasescu · 2025-08-28 13:47:55 +09:00
  9ae6e509b7
• Fix potential loss of room events during join
  Dan Balasescu · 2025-08-28 13:20:02 +09:00
  b95573f97d
• Preserve pre-post notification completion target
  Dan Balasescu · 2025-08-28 13:07:05 +09:00
  e831d1b6fa
• Merge branch 'master' into fix-difficulty-churn
  Dean Herbert · 2025-08-28 02:38:10 +09:00
  ed15e1fb88
• Merge pull request #34812 from bdach/failed-at-judgement

  Fix `HealthProcessor` potentially incorrectly reverting failed state

  Dean Herbert · 2025-08-28 02:37:44 +09:00
  33b99a51b1
• Fix hidden beatmap state not being reflected immediately
  Dean Herbert · 2025-08-28 02:33:18 +09:00
  8a6c857719
• Merge pull request #34809 from peppy/fix-star-rating-weird-mod-double-handling

  Fix beatmap panels locally handling mod and ruleset changes unnecessarily

  Dean Herbert · 2025-08-28 01:27:31 +09:00
  5abd93eda7
• 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 HealthProcessor potentially incorrectly reverting failed state

  This stems from me looking into `TestSceneFailAnimation` failures
  (https://github.com/ppy/osu/runs/48663953318). As it turns out, I should
  not have been mad by CI, and rather should have been mad at myself for
  failing to read.
  
  `FailedAtJudgement` in fact does not mean "this judgement, and only this
  judgement, triggered failure". If any further judgements occur
  post-fail, they will also have `FailedAtJudgement` set to true. It is
  essentially a *dump* of the state of `HealthProcessor.Failed` prior to
  applying the judgement.
  
  	https://github.com/ppy/osu/blob/ec21685c2531af3b243f7f0833ffbb340bf3c044/osu.Game/Rulesets/Scoring/HealthProcessor.cs#L49-L57
  
  Because of this, reverting several judgements which occur post-fail
  could lead to failed state reverting earlier than intended, and thus
  potentially trigger a second fail, thus tripping the `Player` assertion.

  Bartłomiej Dach · 2025-08-27 12:27:11 +02:00
  197c318180
• 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