33 Commits

• Allow changing addition bank button state when objects are selected even if the selection has no addition sounds (#36808)

  Before:
  
  
  https://github.com/user-attachments/assets/d87bd7e3-37f8-4634-9e6a-5859d5bade57
  
  After:
  
  
  https://github.com/user-attachments/assets/4de940af-1e30-4266-9aac-5ccd12f38742
  
  ---
  
  The title is convoluted but basically I'm angling to close
  https://github.com/ppy/osu/issues/36705 with this.
  
  The point is that on current `master`, the keyboard-hotkey-based toggles
  on the left of the screen get disabled if you select a range of objects
  which contains no addition samples. The report linked above finds this
  annoying because it means you basically always need to add an addition
  sound *first* and *then* pick a bank.
  
  This is not necessary, and this commit changes the behaviour such that
  the bank selection toggles are no longer blocked when you select a range
  of objects without additions. Choosing an addition bank when there are
  no additions still does nothing to the selected object, *but* adding a
  sound *after* that bank preselection will use the preselected bank
  rather than auto.

  Bartłomiej Dach · 2026-03-07 00:47:35 +09:00
  16bc1de9fd
• Improve usability of sample bank toggles (#36753)

  - [x] Depends on https://github.com/ppy/osu/pull/36741 for merge
  conflict avoidance
  
  RFC, cc @OliBomby
  
  ## [Adjust behaviour of automatic bank assignment during
  placement](https://github.com/ppy/osu/commit/547f55e9b3ded668fe6e1c8865a2d625e64a2f45)
  
  Diatribe time!
  
  This is fallout of the discussion about auto bank in
  https://github.com/ppy/osu/issues/36705.
  
  Auto bank in lazer as written before this commit is confused. On stable,
  auto bank is closer to "no bank", as in "go look up the current sample
  timing point, get the bank of that, and use that". lazer has no timing
  points anymore, but people still want auto bank. So what do?
  
  Auto bank for normal samples is somewhat sane still. It only works
  during placement, and will just copy the normal bank of the previous
  object - if one exists. That said, one *might not* exist, but the
  resulting object will still have its normal sample created with
  `editorAutoBank: true`. That is largely cosmetic and without
  consequences, but this commit fixes that.
  
  Auto bank for *addition* samples, however... Hoo boy.
  
  - For placed objects, auto bank means "take the normal sample, read its
  bank, and use that". Simple enough, right?
  - Hoooooowever. During placement, auto bank before this commit used to
  mean "look at the *previous object*, check if it has an addition sound
  and then use its bank, if not use *the previous object's* normal sample
  and then use its bank" which is a completely different thing with its
  own implications. Like, say, what happens if the previous object uses
  the auto addition bank too? What should be copied over? Should it be the
  notion of "auto bank" in that the addition bank should match the normal
  bank, or should it be the literal bank that the previous object is
  using?
  
  This change attempts to define this unambiguously. "Auto additions bank"
  means "the same bank as the normal bank of this object", full stop.
  
  ## [Do not touch sample toggle state if there are no selected
  objects](https://github.com/ppy/osu/commit/052cde5987e48800ec68ab2528c7e0ce3140e6e0)
  
  Fixes issue described in
  https://github.com/ppy/osu/issues/36705#issuecomment-3953917163 wherein
  opening a sample popover will disable addition bank toggles and toggle
  off all addition samples.
  
  ---------
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Bartłomiej Dach · 2026-02-26 15:18:29 +09:00
  7e2771c3f0
• Fix changing normal sample bank via keyboard hotkeys not updating addition bank if set to auto (#36741)

  Closes https://github.com/ppy/osu/issues/36703.
  
  It was only broken via keyboard hotkeys and not via the sample popover
  because the sample popover has a separate copy of the logic that didn't
  have the bug. Compare:
  
  
  https://github.com/ppy/osu/blob/13aeed15f95fa6585ff01eedaccc43b28ff656cb/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs#L473-L475
  
  I considered splitting a helper to have one copy of the logic but it's
  not very simple to do compared to a two-liner fix so I gave up.

  Bartłomiej Dach · 2026-02-26 02:47:45 +09:00
  5174d8b918
• Fix tests
  Bartłomiej Dach · 2025-10-24 12:09:38 +02:00
  78eaad13ae
• Remove leftover [Solo] attribute
  Bartłomiej Dach · 2024-11-26 12:40:49 +01:00
  c69d36dc96
• Add failing test case showing changing selection in editor affects samples
  Dean Herbert · 2024-11-26 17:33:41 +09:00
  e0199386a3
• Fix TestHotkeysUnifySliderSamplesAndNodeSamples
  OliBomby · 2024-10-01 11:02:46 +02:00
  3769b0da5d
• Merge branch 'master' into additions
  Dean Herbert · 2024-10-01 16:38:56 +09:00
  1b4215576d
• fix test
  OliBomby · 2024-08-29 22:22:15 +02:00
  3a1afda2b3
• Merge remote-tracking branch 'upstream/master' into doubleclick
  OliBomby · 2024-08-29 19:34:18 +02:00
  ba0c4df2a9
• Merge remote-tracking branch 'upstream/master' into doubleclick
  OliBomby · 2024-08-20 23:19:27 +02:00
  ae6d855f8d
• Add failing test
  Bartłomiej Dach · 2024-08-20 12:36:05 +02:00
  3202c77279
• Merge branch 'master' into additions
  Dean Herbert · 2024-08-08 03:31:11 +09:00
  b5a19707d0
• Add test coverage for expected sample popover behaviour
  Bartłomiej Dach · 2024-07-24 12:08:13 +02:00
  55382a4ba6
• extend tests
  OliBomby · 2024-07-14 22:50:25 +02:00
  29c2e821ea
• update tests
  OliBomby · 2024-07-05 14:33:15 +02:00
  9013c119ab
• Add failing test coverage
  Bartłomiej Dach · 2024-07-05 08:54:47 +02:00
  d6c1b5d399
• Add test coverage
  OliBomby · 2024-07-04 15:25:43 +02:00
  00f7a34139
• Add failing test coverage for changing banks/samples not working on node samples
  Bartłomiej Dach · 2024-07-02 16:21:56 +02:00
  6453522b34
• Fix obsoletion warning
  Bartłomiej Dach · 2024-06-06 13:50:31 +02:00
  dd9c77d248
• Merge branch 'master' into edit-nodesample
  Bartłomiej Dach · 2024-06-06 13:42:25 +02:00
  86b13074a0
• Cast remaining test usages to IFocusManager to remove obsolete notice
  Dean Herbert · 2024-05-22 21:55:53 +08:00
  093be3d723
• fix focus test
  OliBomby · 2023-08-16 23:16:57 +02:00
  080d2b62f4
• Merge branch 'master' into edit-nodesample
  Dean Herbert · 2023-07-31 14:06:38 +09:00
  f06b203067
• Manual fixes to reduce warnings to zero
  Dean Herbert · 2023-06-24 01:52:53 +09:00
  df5b389629
• Automated pass
  Dean Herbert · 2023-06-24 01:00:03 +09:00
  0ab0c52ad5
• add new behaviour tests to TestSceneHitObjectSampleAdjustments
  OliBomby · 2023-06-02 00:40:00 +02:00
  035163a792
• Add test coverage of new hotkeys
  Dean Herbert · 2023-05-24 17:33:48 +09:00
  8e5ba2208d
• Update new usages of "soft" to use the new constant
  Dean Herbert · 2023-05-24 14:04:10 +09:00
  e68ba6366c
• Merge branch 'master' into sample-set-controls
  Dean Herbert · 2023-05-24 14:03:04 +09:00
  298989ffd2
• Add failing test case for sample undo
  Bartłomiej Dach · 2023-05-22 22:23:05 +02:00
  2ce150ba2b
• Add test coverage of failing sample bank transfer
  Dean Herbert · 2023-05-16 18:52:52 +09:00
  ebce39cd1c
• Rename editor sample adjustment test scene to increase scope of tests
  Dean Herbert · 2023-05-16 18:52:52 +09:00
  8528fcaedc