200 Commits

• Add basic colour indication as to when placements are valid

  Unsure about this one, but I find the preceding commit to be very
  lacking in explaining to the user why the editor don't work. Shining
  some things red may help aid understanding.

  Bartłomiej Dach · 2025-12-04 14:37:56 +01:00
  c6cc92315c
• Disallow placing hit objects before first timing point

  Because they can break stable. See
  https://github.com/ppy/osu/issues/31591#issuecomment-3575270120 for
  detailed rationale.

  Bartłomiej Dach · 2025-12-04 14:15:52 +01:00
  12170df80a
• Fix several issues with editor timestamps for objects with fractional start times in osu!mania (#35829)

  * Fix mania editor timestamp generation being culture-dependent
  
  Mostly closes https://github.com/ppy/osu/issues/35809.
  
  * Add failing test for notes with fractions
  
  * Round note time when copying out timestamp & apply half-millisecond tolerance when parsing
  
  Closes the rest of https://github.com/ppy/osu/issues/35809.
  
  One issue here was that while the timestamp generation would allow
  fractional object timestamps to be output, the parsing (via
  `selection_regex`) would *reject* fractional timestamps, therefore
  making lazer incompatible even with itself.
  
  The other is that rounding is probably fine to do anyway for
  interoperability with stable. I'd hope nobody actually *needs*
  sub-millisecond precision but I'm ready to be proven wrong by some
  aspire jokester.
  
  * Specify invariant culture when writing out combo indices to editor timestamp in other rulesets
  
  Pretty sure this is just a much-of-muchness because it's integers but
  might as well if I'm spending time here already.

  Bartłomiej Dach · 2025-11-28 08:21:13 +09:00
  a8f058141b
• initial pass on updated verifier context usage across most checks
  Hivie · 2025-08-11 14:57:14 +01:00
  fd6cf680b9
• use TimeSpan for defining thresholds
  Hivie · 2025-07-21 12:32:45 +01:00
  86369ab403
• Add verify check for lowest diff drain time requirement
  Hivie · 2025-07-13 02:00:50 +01:00
  ccf6d9c173
• 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
• Make CheckConcurrentObject ruleset specific
  Derrick Timmermans · 2025-05-25 14:19:23 +02:00
  0065696248
• Fix editor setup screen sliders not having correct keyboard steps

  Closes https://github.com/ppy/osu/issues/32691.
  
  Fixes some extra cases of failure that aren't pointed out in the issue.

  Dean Herbert · 2025-04-08 14:45:43 +09:00
  f2088496c5
• Fix edge case allowing almost-zero-length sliders to be placed during distance snapping
  Dean Herbert · 2025-03-11 16:17:44 +09:00
  23891b1994
• Fix nudge operations incurring FP error from coordinate space conversions

  Closes https://github.com/ppy/osu/issues/31915.
  
  Reproduction of aforementioned issue requires 1280x720 resolution, which
  should also be a good way to confirm that this does anything.
  
  To me this is also equal-parts-bugfix, equal-parts-code-quality PR,
  because tell me: what on earth was this code ever doing at
  `ComposeBlueprintContainer` level? Nudging by one playfield-space-unit
  doesn't even *make sense* in something like taiko or mania.

  Bartłomiej Dach · 2025-02-17 15:21:07 +01:00
  f37a56c307
• Refactor IDistanceSnapProvider to accept slider velocity objects as a reference

  Method signatures are also changed to be a lot more explicit as to what
  inputs they expect.

  Bartłomiej Dach · 2025-02-03 14:00:57 +01:00
  a1185df2eb
• Merge pull request #31655 from bdach/deabstractify-editor-snap

  Refactor editor object snapping to remove bad abstractions

  Dan Balasescu · 2025-01-30 01:38:42 +09:00
  48b1c7398e
• Remove "Accuracy" and "Stack Leniency" from osu!catch editor setup
  Dean Herbert · 2025-01-28 21:22:51 +09:00
  1aa1137b09
• Refactor further to avoid weird non-virtual common method
  Bartłomiej Dach · 2025-01-24 13:14:31 +01:00
  daec91f61d
• 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
• Merge pull request #31462 from bdach/ternary-button-is-bad

  Simplify editor "ternary button" structure

  Dan Balasescu · 2025-01-10 14:24:41 +09:00
  38d95abc24
• Merge pull request #31453 from bdach/fix-juice-stream-placement-offset

  Fix juice stream placement blueprint being initially visually offset

  Dean Herbert · 2025-01-10 01:51:24 +09:00
  2133ac6d01
• 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
• Fix juice stream placement blueprint being initially visually offset

  - Closes https://github.com/ppy/osu/issues/31423.
  - Regressed in https://github.com/ppy/osu/pull/30411.
  
  Admittedly, I don't completely understand all of the pieces here,
  because code quality of this placement blueprint code is ALL-CAPS
  ATROCIOUS, but I believe the failure mode to be something along the
  lines of:
  
  - User activates juice stream tool, blueprint gets created in initial
    state. It reads in a mouse position far outside of the playfield, and
    sets internal positioning appropriately.
  - When the user moves the mouse into the bounds of the playfield, some
    positions update (the ones inside `UpdateTimeAndPosition()`, but the
    fruit markers are for *nested* objects, and
    `updateHitObjectFromPath()` is responsible for updating those...
    however, it only fires if the `editablePath.PathId` changes, which it
    won't here, because there is only one path vertex until the user
    commits the starting point of the juice stream and it's always at
    (0,0).
  - Therefore the position of the starting fruit marker remains bogus
    until left click, at which point the path changes and everything
    returns to *relative* sanity.
  
  The solution essentially relies on inlining the broken method and only
  guarding the relevant part of processing behind the path version check
  (which is actually updating the path). Everything else that can touch
  positions of nesteds (like default application, and the drawable piece
  updates) is allowed to happen unconditionally.

  Bartłomiej Dach · 2025-01-09 09:37:57 +01:00
  18f1d62182
• Delete entire juice stream when only one vertex remains after deleting another vertex

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

  Bartłomiej Dach · 2025-01-08 11:47:25 +01:00
  9058fd9739
• Add comments backreferences to copies of duplicated code for future use
  Bartłomiej Dach · 2024-12-11 16:26:11 +09:00
  5a0b732ee3
• Merge branch 'master' into catch-convert-to-stream
  Bartłomiej Dach · 2024-12-11 16:24:45 +09:00
  1f43ad3928
• Do not show distance to next/previous object if said object is a banana shower

  The results of such a display were a little bit nonsensical.

  Bartłomiej Dach · 2024-11-21 12:17:43 +01:00
  2138729c02
• Align inspector info more to how it is shown for osu
  Darius Wattimena · 2024-11-19 19:54:12 +01:00
  a8e14b6625
• 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
• Made reading of ReadCurrentDistanceSnap public
  Darius Wattimena · 2024-11-18 23:49:40 +01:00
  16158710f9
• Change text to stream instead of fruits as that is the term by catch mappers
  Darius Wattimena · 2024-11-18 22:30:15 +01:00
  00e3b20ff0
• Adds an option to the catch editor to convert sliders to fruits
  Darius Wattimena · 2024-11-18 22:19:08 +01:00
  5ac3bb73ee
• Apply code feedback and also resize catcher trails when any is shown
  Darius Wattimena · 2024-10-24 23:17:47 +02:00
  5e642cbce7
• Fix an issue where changing the CircleSize wouldn't adjust the catcher size and represent hyperdashes incorrectly
  Darius Wattimena · 2024-10-15 21:47:22 +02:00
  b75437ee13
• Merge branch 'master' into hotkeys-in-context-menus
  Dean Herbert · 2024-10-01 15:50:19 +09:00
  590f27e0a0
• 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
• Add hotkey hints to editor menus
  Bartłomiej Dach · 2024-09-04 12:16:54 +02:00
  130802e480
• Fix incorrect osu!catch snap display when last object is a juice stream

  Addresses https://github.com/ppy/osu/discussions/29678.

  Dean Herbert · 2024-09-02 17:26:14 +09:00
  171ac0f510
• Fix editing juice stream path sometimes changing its duration

  I'm not *super* sure why this works, but it appears to, and my educated
  guess as to why is that it counteracts the effects of a change in the SV
  of the juice stream by artificially increasing or decreasing the
  velocity when running the appropriate path conversions and expected
  distance calculations. The actual SV change takes effect on the next
  default application, which is triggered by the `Update()` call at the
  end of the method.

  Bartłomiej Dach · 2024-07-22 15:14:45 +02:00
  f3617eadad
• Fix EditablePath.UpdateHitObjectFromPath() not automatically updating object

  This is important because the editable path conversions heavily depend
  on the value of `JuiceStream.Velocity` being correct. The value is only
  guaranteed to be correct after an `ApplyDefaults()` call, which is
  triggered by updating the object via `EditorBeatmap`.

  Bartłomiej Dach · 2024-07-22 14:50:25 +02:00
  56af009e77
• Unify juice stream piece UX with osu! control point pieces

  - Use same hover state
  - Use shift-right click for quick delete rather than shift-left click

  Bartłomiej Dach · 2024-07-22 13:30:15 +02:00
  6b3c1f4e47
• Fix catch juice stream vertex remove operation not undoing
  Bartłomiej Dach · 2024-07-22 13:21:49 +02:00
  47964f33d7
• Fix catch juice stream vertex add operation not undoing
  Bartłomiej Dach · 2024-07-22 12:18:53 +02:00
  64381d4087
• Update HasFlag usages
  Dean Herbert · 2024-07-03 00:19:04 +09:00
  5350945340
• Adjust calls to GetContainingInputManager()
  Bartłomiej Dach · 2024-06-18 07:41:19 +02:00
  659505f711
• Merge pull request #27723 from 64ArthurAraujo/editor-fix-reverse-selection

  Fix reverse selection not updating new combo location

  Bartłomiej Dach · 2024-03-28 11:25:17 +01:00
  21201e616d
• Simplify implementation
  Bartłomiej Dach · 2024-03-28 10:12:27 +01:00
  2f786ffc32
• Fix combo not reversing properly depending on the order of selection
  Arthur Araujo · 2024-03-26 12:10:40 -03:00
  01a72d5afa