60 Commits

• Read & output combo indices in timestamps in catch editor

  Addresses https://github.com/ppy/osu/discussions/33912 for catch
  specifically. Code copy-pasted from osu! ruleset.
  
  I'm leaving taiko be because new combo still doesn't make any sense in
  taiko. It'd probably either have to be object index in beatmap period
  instead of index in combo, or the `kdkdkdkdkkkdkdkkkdkkdkd` notation
  people use.

  Bartłomiej Dach · 2025-06-30 11:50:31 +02:00
  535d9f5b58
• Remove dependence of placement blueprints on IPositionSnapProvider
  Bartłomiej Dach · 2025-01-24 11:59:07 +01:00
  a6987f5c95
• Remove dependence of blueprint containers on IPositionSnapProvider
  Bartłomiej Dach · 2025-01-24 11:59:05 +01:00
  15b6e28ebe
• Add combo colour override control to editor

  Closes https://github.com/ppy/osu/issues/25608.
  
  Logic mostly matching stable. All operations are done on `ComboOffset`
  which still makes overridden combo colours weirdly relatively dependent
  on each other rather than them be an "absolute" choice, but alas...
  
  As per stable, two consecutive new combos can use the same colour only
  if they are separated by a break:
  
      https://github.com/peppy/osu-stable-reference/blob/52f3f75ed7efd7b9eb56e1e45c95bb91504337be/osu!/GameModes/Edit/Modes/EditorModeCompose.cs#L4564-L4571
  
  This control is only available once the user has changed the combo
  colours from defaults; additionally, only a single new combo object
  must be selected for the colour selector to show up.

  Bartłomiej Dach · 2025-01-10 13:40:56 +01:00
  48196949e0
• Simplify editor "ternary button" structure

  As I look into re-implementing the ability to choose combo colour for an
  object (also known as "colourhax") from the editor UI, I stumble upon
  these wretched ternary items again and sigh a deep sigh of annoyance.
  
  The structure is overly rigid. `TernaryItem` does nothing that
  `DrawableTernaryItem` couldn't, except make it more annoying to add
  specific sub-variants of `DrawableTernaryItem` that could do more
  things.
  
  Yes you could sprinkle more levels of virtuals to
  `CreateDrawableButton()` or something, but after all, as Saint Exupéry
  says, "perfection is finally attained not when there is no longer
  anything to add, but when there is no longer anything to take away."
  So I'm leaning for taking one step towards perfection.

  Bartłomiej Dach · 2025-01-09 13:41:22 +01:00
  5c8ae6f851
• Added a custom hitobject inspector for catch additionally show the x value of prev and next
  Darius Wattimena · 2024-11-18 23:53:01 +01:00
  111f029ead
• Merge pull request #29949 from minetoblend/feature/scale-around-center

  Support scaling around center when scaling with select box

  Dean Herbert · 2024-09-28 21:37:39 +09:00
  c46d787f1e
• fix warnings
  OliBomby · 2024-09-24 20:32:08 +02:00
  d26e677bb7
• Refactor PlacementBlueprint to not be hitobject specific
  OliBomby · 2024-09-24 20:31:00 +02:00
  e3b4483872
• Prevent the distance snap grid from being activated by alt key while dragging select box handle
  Marvin Schürz · 2024-09-21 14:22:17 +02:00
  3180468db1
• Update HasFlag usages
  Dean Herbert · 2024-07-03 00:19:04 +09:00
  5350945340
• Fix catch distance snap grid not moving

  Regressed in https://github.com/ppy/osu/pull/25154.
  Specifically, in 013b5fa916
  and 74b86349d5.
  
  A simple case of too-much-code-deleted-itis.

  Bartłomiej Dach · 2023-10-26 15:42:50 +02:00
  359ae31204
• Tidy up CatchHitObjectComposer
  Dean Herbert · 2023-10-19 23:57:36 +09:00
  74b86349d5
• Move beat snap grid implementation details to ScrollingHitObjectComposer
  Dean Herbert · 2023-10-19 23:54:34 +09:00
  013b5fa916
• Merge branch 'master' into taiko-beat-snap-grid
  Dean Herbert · 2023-10-19 23:53:01 +09:00
  52c2eb93de
• Inherit ScrollingHitObjectComposer in catch
  Bartłomiej Dach · 2023-10-19 11:58:25 +02:00
  0c4e74c82d
• Remove DistancedHitObjectComposer inheritance from catch composer
  Bartłomiej Dach · 2023-10-19 11:46:30 +02:00
  31849192c3
• Combine selection and input handling logic for beat snap grids across all rulesets
  Dean Herbert · 2023-10-17 17:09:42 +09:00
  4381169a3f
• Move comment a bit to fix formatting

  Would otherwise trigger IDE0055, but that isn't resolveable without
  an inspection cycle with resharper, so just move in a more sane place.

  Bartłomiej Dach · 2023-09-20 12:22:05 +02:00
  f2791d4f3e
• Remvoe null default for mods which can't be null
  Dean Herbert · 2023-09-20 15:27:50 +09:00
  41a8239e49
• Move toggle implementation to work on all scrolling rulesets automatically
  Dean Herbert · 2023-09-01 19:53:10 +09:00
  37c2b330a2
• Add beat snap grid for osu!catch editor

  As discussed in https://github.com/ppy/osu/discussions/23462.

  Dean Herbert · 2023-06-06 17:52:29 +09:00
  c1f23ef211
• Fix incorrect catch grid specification
  Dean Herbert · 2023-05-26 10:41:29 +09:00
  3c69956b55
• Split out grid snapping modes into "relative" and "global" types
  Dean Herbert · 2023-05-25 21:41:19 +09:00
  804671ca74
• Move right-side editor toolbox to base HitObjectComposer

  Move right-side editor toolbox to base `HitObjectComposer`

  Dean Herbert · 2023-04-04 19:00:56 +09:00
  f9ebdadfe8
• Remove #nullable disable from Catch.Edit namespace
  ekrctb · 2023-01-15 17:29:32 +09:00
  a75fc5108a
• Code Quality
  Dylan Nantz · 2023-01-13 10:16:52 -05:00
  6028abff39
• Use PlacementState to check juice stream placement
  Dylan Nantz · 2023-01-13 09:37:23 -05:00
  e38075c4ef
• Show distance snap for first juice stream object. Fixes #18469
  Dylan Nantz · 2022-12-05 15:12:50 -05:00
  4ab7ef9af9
• Partial everything
  Dan Balasescu · 2022-11-27 00:00:27 +09:00
  7bc8908ca9
• Add osu!catch read-distance-spacing implementation
  Dean Herbert · 2022-10-26 13:45:06 +09:00
  f8a4af5e0e
• Merge branch 'grid-momentary-shortcuts' into read-current-distance-snap
  Dean Herbert · 2022-10-26 13:28:04 +09:00
  7d59bc6e2f
• Move distance snap toggle button implementation to DistancedHitObjectComposer
  Dean Herbert · 2022-10-26 13:27:23 +09:00
  54ae16badc
• Simplify logic with new multi-grid snap support
  Dean Herbert · 2022-10-25 14:22:30 +09:00
  2f0283e4d4
• Display current distance snap and add button to update to use it
  Dean Herbert · 2022-10-21 22:58:36 +09:00
  645a84b1d6
• Remove unused using statement
  Dean Herbert · 2022-10-21 19:55:58 +09:00
  1e09a21279
• Apply same fix to osu!catch composer
  Dean Herbert · 2022-10-21 17:15:36 +09:00
  16f5c2a7c6
• Add momentary shortcuts to toggle grid/distance snap

  Matching osu!stable. I use these quite a lot while mapping and I'm sure
  others do as well.
  
  Hold `Shift` = invert grid snap
  Hold `Alt` = invert distance snap

  Dean Herbert · 2022-10-19 20:06:41 +09:00
  830b92d3ae
• Add inline comment mentioning binding issues
  Dean Herbert · 2022-10-18 12:10:30 +09:00
  1778120f3e
• Allow changing scrolling speed in catch editor

  Scroll speed is not saved and doesn't affect gameplay.
  It is purely a feature for a better visualization.
  It is currently bind to scroll speed increase/decrease.
  Default F3/F4 crashes with editor shortcuts so it has to be changed.

  ekrctb · 2022-10-06 18:06:16 +09:00
  9247ff3e0a
• Allow arbitrary height catch editor

  Useful because can see more notes at once.

  ekrctb · 2022-10-06 17:26:03 +09:00
  e8cd9a5d11
• Update parameter discards
  Dean Herbert · 2022-06-24 21:26:19 +09:00
  31a447fda0
• Automated #nullable processing
  Dan Balasescu · 2022-06-17 16:37:17 +09:00
  f8830c6850
• Add enum to snap method as alternative to mutliple nested invocations
  Dean Herbert · 2022-05-12 16:19:07 +09:00
  c0abce918f
• Add xmldoc and rename methods in IPositionSnapProvider for legibility
  Dean Herbert · 2022-05-05 15:58:21 +09:00
  f6fc926f1a
• Clarify TODO comment
  Salman Ahmed · 2022-04-28 10:57:14 +03:00
  b6d2ca7709
• Let CatchHitObjectComposer inherit from DistancedHitObjectComposer and hide control
  Salman Ahmed · 2022-04-28 06:44:50 +03:00
  bfc6bfc91b
• Encapsulate distance spacing control handling to a "distance toolbox composite"

  Encapsulated in a way which can allow further extensibility for the
  right-side area of toolboxes.

  Salman Ahmed · 2022-04-24 08:33:03 +03:00
  8ed39009fd
• Add "distance spacing" multiplier for osu! ruleset

  While osu!catch also implements a distance snap grid, it doesn't rely on
  `GetBeatSnapDistanceAt` (unlike osu!), therefore it can't have the
  "distance spacing" multiplier yet.

  Salman Ahmed · 2022-02-15 02:21:53 +03:00
  19ee05c232
• Don't assume catcher dash speed is 2x the walk speed
  ekrctb · 2021-10-26 20:09:48 +09:00
  e5050b90a5