80 Commits

• 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
• Merge pull request #33328 from frenzibyte/ssv2-placeholder-atmosphere

  Duck music and dim background when "no results" placeholder is visible

  Dean Herbert · 2025-06-02 16:56:03 +09:00
  bd4e95eb64
• Don't touch beatmap background
  Dean Herbert · 2025-06-02 16:02:32 +09:00
  b56fd5b4b4
• Fix clicking song select search links not working
  Dean Herbert · 2025-05-31 14:06:56 +09:00
  b650309706
• Duck music and dim background when "no results" placeholder is visible
  Salman Alshamrani · 2025-05-31 03:23:02 +03:00
  59045c8bca
• SongSelectV2: Fix more crashes resulting from users deliberately trying to break things

  See https://github.com/ppy/osu/issues/33336#issuecomment-2922443444.
  
  Can't wait for even more human fuzzing to come later.

  Bartłomiej Dach · 2025-05-30 19:54:49 +02:00
  d2abfe4370
• Replace assertion with hard guard

  Closes https://github.com/ppy/osu/issues/33336.
  
  I was worried that doing that was going to cause terminal breakage but
  in testing it does not appear to so I'm just going to do this and call
  it a day.

  Bartłomiej Dach · 2025-05-30 15:05:14 +02:00
  ba1148c59e
• Merge pull request #33332 from peppy/song-select-v2-fix-double-filter

  SongSelectV2: Fix carousel filtering twice on entering song select

  Bartłomiej Dach · 2025-05-30 12:29:32 +02:00
  559ddd1ec9
• Use nullable Criteria instead of ctor flag
  Dean Herbert · 2025-05-30 18:15:27 +09:00
  5bf235f2dc
• Fix unintentional initial filter delay on entering song select
  Dean Herbert · 2025-05-30 18:08:28 +09:00
  5222c30139
• Merge branch 'master' into song-select-v2-polish-2
  Bartłomiej Dach · 2025-05-30 11:07:11 +02:00
  4915e4d266
• Fix carousel filtering twice on entering song select
  Dean Herbert · 2025-05-30 16:03:31 +09:00
  bb938be0b6
• SongSelectV2: Add back ability to manage collections from beatmap / set panel context menus
  Dean Herbert · 2025-05-30 15:04:42 +09:00
  2bbd1ee384
• Allow resetting search terms from placeholder
  Dean Herbert · 2025-05-30 14:29:02 +09:00
  64328ffc27
• Add gradient behind carousel to make placeholder easier to see
  Dean Herbert · 2025-05-30 14:29:01 +09:00
  d179d330bc
• Change song select v2 colour scheme to Blue
  Dean Herbert · 2025-05-30 14:29:01 +09:00
  5943bd4388
• Adjust panel x offsets to match user expectations better
  Dean Herbert · 2025-05-30 02:20:39 +09:00
  02610c5afe
• Add very slight background dim
  Dean Herbert · 2025-05-29 20:31:48 +09:00
  4f38f9f486
• Fix leaderboard not showing last portion near bottom footer
  Dean Herbert · 2025-05-29 20:11:30 +09:00
  88062d0a30
• Reduce maximum sizing of left/right component areas
  Dean Herbert · 2025-05-29 20:11:30 +09:00
  3da4651ea2
• Merge pull request #33318 from bdach/song-select-v2-footer-buttons-stupid

  SongSelectV2: Disable footer buttons when transitioning to another screen

  Dean Herbert · 2025-05-29 18:43:24 +09:00
  9e6d657ec8
• Add precautionary assertion guarding against song select messing with logo while not current

  I considered having this just be a straight guard followed by an
  early-return, but if that guard ever actually gets hit, things are going
  to be severely broken all over, and un-breaking them at that point will
  be very annoying, so just going to cross fingers and hope this can be an
  assertion forevermore instead.

  Bartłomiej Dach · 2025-05-29 10:38:42 +02:00
  cfa0a49e59
• Centralise current screen check
  Bartłomiej Dach · 2025-05-29 09:59:50 +02:00
  26aca19af4
• SongSelectV2: Select random instead of fixed item when recovering from no selection
  Dean Herbert · 2025-05-29 01:53:10 +09:00
  b4a6803236
• Fix multiple issues causing song select to retain a deleted or hidden selection
  Dean Herbert · 2025-05-29 01:53:10 +09:00
  8f18336b2c
• SongSelectV2: Fix filtering all results away nuking user's selection
  Dean Herbert · 2025-05-29 00:44:48 +09:00
  5d5a569523
• Set random beatmap on entering song select
  Dean Herbert · 2025-05-28 16:54:11 +09:00
  f602bdeb2f
• SongSelectV2: Add back basic random selection support

  This is a minimal implementation in order to keep moving forward.
  
  For simplicity I've copied over the old implementation verbatim. Note
  that this is beatmap*set* based randomisation, which means that when
  panels are split up by difficulty, it is still randomising by set (with
  the difficulty choice being left up to the user recommendation system).
  I think this is what we want, but if it isn't, any changes can come
  later.

  Dean Herbert · 2025-05-28 16:54:11 +09:00
  1b56ce9a39
• Finalise selection before entering edit / play modes
  Dean Herbert · 2025-05-27 19:33:12 +09:00
  533e0513ad
• Add support for presenting beatmaps at song select v2
  Dean Herbert · 2025-05-27 19:33:11 +09:00
  7290f912d9
• Merge pull request #33279 from peppy/song-select-v2-reset-scroll

  SongSelectV2: Scroll to selection when mouse moves to left area

  Bartłomiej Dach · 2025-05-27 10:50:12 +02:00
  f34980ba54
• Add inline comment explaining depth adjustment
  Dean Herbert · 2025-05-27 16:24:28 +09:00
  cc206fad11
• Add reset scroll support when moving cursour out of carousel
  Dean Herbert · 2025-05-27 15:53:32 +09:00
  32044d745a
• Fix logo animations being interrupted incorrectly
  Dean Herbert · 2025-05-27 02:19:50 +09:00
  eea5a2f893
• Fix logo transitions with song select v2
  Dean Herbert · 2025-05-27 02:19:50 +09:00
  68d557b4ad
• Add missing current screen check

  I don't understand why stuff that was present in v1 wasn't carried
  across to v2 rather than waiting until stuff breaks a second time to fix
  it.

  Dean Herbert · 2025-05-27 02:16:56 +09:00
  d765b7e233
• Fix mod and beatmap options toggle keys not working
  Dean Herbert · 2025-05-27 01:44:06 +09:00
  bb6bdec361
• Fix backgroud blur getting stuck when returning to song select v2
  Dean Herbert · 2025-05-27 01:44:01 +09:00
  daaa90d902
• Fix grammar in comment
  Bartłomiej Dach · 2025-05-26 14:08:56 +02:00
  72bd8b2203
• Ensure protected beatmap is reselected on entering screen
  Dean Herbert · 2025-05-26 19:32:32 +09:00
  5212c27a71
• Fix beatmap background not being used at new song select
  Dean Herbert · 2025-05-26 19:32:32 +09:00
  d0a1b40a84
• Add basic "eager" selection to ensure something is selected at song select after import
  Dean Herbert · 2025-05-26 19:32:32 +09:00
  4a03240ee6
• Hook up carousel to song select to global beatmap
  Dean Herbert · 2025-05-26 19:32:31 +09:00
  c1e1bfde0a
• Add back two missing actions for beatmap set headers
  Dean Herbert · 2025-05-24 11:28:12 +09:00
  a1426eb8be
• Add context menus to new carousel panels

  This changes the flow of actions (yet again.. sorry) to standardise what
  is shown on the beatmap options button in the footer and the context
  menus.
  
  This is something I wanted from the start – for devices where right
  click is not available, it's always preferable to have a second method
  of accessing actions which isn't the context menu.
  
  Collection actions are missing for now, as they will come in a second
  pass which includes tidying things up further.
  
  Fix formatting
  
  Duplicate menu items between implementations

  Dean Herbert · 2025-05-23 16:02:13 +09:00
  891f0c469f