Salman Ahmed
62cb6a98ca
Remove redundant nullable suppression directives
2023-06-07 08:20:41 +03:00
Bartłomiej Dach
e35201cb99
Don't snap non-head slider nodes to distance grid during placement either
...
1cd69220ef
2023-05-26 19:51:20 +02:00
Dean Herbert
1cd69220ef
Fix slider path placement snapping non-head nodes to distanced snapping grid
...
As discussed at https://github.com/ppy/osu/discussions/23531 .
2023-05-25 21:41:43 +09:00
Dean Herbert
804671ca74
Split out grid snapping modes into "relative" and "global" types
2023-05-25 21:41:19 +09:00
Dean Herbert
b58ab28765
Make EditorClock non-nullable in PlacementBlueprint
2023-05-17 21:40:52 +09:00
Dean Herbert
f443cfb93e
Move blueprint validity conditions to allow more correct external usage of EndPlacement
...
Until now, these were haphazardly enforce inline in blueprint
implementations. The only thing stopping complete breakage is that
`EndPlacement` wasn't called (too much) from outside the blueprint,
leaving them responsible for their own placement.
By moving this conditional out of the provided paramters to
`EndPlacement`, it allows more flexible usage of that method externally.
Coming in a future PR.
2023-05-12 16:02:22 +09:00
Dean Herbert
6b017ac05f
Merge pull request #23308 from OliBomby/sample-control-points
...
Remove SampleControlPoint and DifficultyControlPoint from HitObject
2023-05-03 14:21:51 +09:00
Dean Herbert
67f83f246b
Add more padding around playfield in editor to avoid overlap with tool areas
...
Closes #23130 .
2023-05-02 15:37:02 +09:00
OliBomby
c44f71a737
remove all regular usage of DifficultyControlPoint
2023-04-26 17:55:38 +02:00
OliBomby
9f8d7bccba
fix usings
2023-04-26 17:34:02 +02:00
OliBomby
d97daee96b
remove all non-test usage of SampleControlPoint
2023-04-26 13:55:39 +02:00
Dean Herbert
45e3e3623b
Fix spinners being selectable for too long after they fade in the editor
...
The actual visual extension is only applied to `HitCircle`s (which does include slider
start / end), and should not be applied to spinners in the first place.
Addresses https://github.com/ppy/osu/discussions/22949 .
2023-03-28 18:49:59 +09:00
Bartłomiej Dach
49443f0b55
Inline temporary variable
2023-02-04 14:36:30 +01:00
Bartłomiej Dach
a1343dacc1
Merge branch 'master' into SnapToReverseSlider
2023-02-04 14:14:37 +01:00
Wleter
60f6484073
fix spaces
2023-02-03 16:13:37 +01:00
Wleter
f7f13cb9d9
fix formatting
2023-02-03 16:13:04 +01:00
Wleter
20e220df56
prioritize closest snap position
2023-02-03 16:05:16 +01:00
Wleter
23e9bdd554
check every snap position in blueprint
2023-02-02 14:22:30 +01:00
Dean Herbert
7344d34d5b
Move where class specs to next line
2023-01-26 17:12:41 +09:00
Dean Herbert
13937cf555
Merge branch 'master' into stream-tool-2
2023-01-26 16:08:20 +09:00
Dean Herbert
73f083a316
Refactor how additional points are provided to avoid confusion
2023-01-23 14:13:46 +09:00
Wleter
f8d8a627b8
change property name
2023-01-18 22:00:39 +01:00
Wleter
ab78dd0436
add collection of selection points.
2023-01-18 21:34:23 +01:00
Dean Herbert
ecb4727aec
Fix formatting issues
2023-01-18 17:33:14 +09:00
Wleter
00f15d19f9
fix double newlines
2023-01-17 21:11:21 +01:00
Wleter
e5863fbaf1
add ScreenSpaceEndPoint field
2023-01-10 21:20:09 +01:00
Wleter
38bb7ac0c7
add fields for path's end location
2023-01-10 21:16:34 +01:00
Dean Herbert
192536643c
Fix some more inspections
2022-12-16 20:21:19 +09:00
OliBomby
d458c3a012
Fix variable which didnt get renamed
2022-12-07 10:13:40 +01:00
OliBomby
10b5900710
made PathControlPointVisualiser generic
2022-12-07 10:13:40 +01:00
Dan Balasescu
ee62f3c0d3
Fix test failure
...
Similar to SliderPlacementBlueprint.
2022-12-02 18:32:43 +09:00
Dean Herbert
45ea183cc3
Fix being able to place zero-length spinners
...
Also always snap a spinner's end time using beat snap (matches stable).
2022-12-02 17:57:15 +09:00
Dan Balasescu
7bc8908ca9
Partial everything
2022-11-27 00:00:27 +09:00
Dean Herbert
12606122e3
Fix sliders not correctly taking on full available length after changing curve type
2022-11-17 13:59:07 +09:00
Dean Herbert
ada039151b
Add the ability to toggle off hit marker displays in the editor
2022-11-08 18:07:06 +09:00
Dean Herbert
e02c477008
Merge pull request #21017 from andy840119/remove-nullable-disable-in-the-checks
...
Remove nullable disable in the checks.
2022-11-06 18:39:03 +09:00
andy840119
b0673636ca
Remove nullable disable annotation in the osu ruleset.
2022-11-05 16:49:55 +08:00
Bartłomiej Dach
23134aea61
Update outdated comment
2022-11-04 19:48:19 +01:00
Dean Herbert
36c08b69fe
Fix failing tests
2022-11-04 20:47:49 +09:00
Dean Herbert
20021551bb
Fix editor selection behaviour regressions due to new path visualiser optimisation
2022-11-04 19:36:59 +09:00
Dan Balasescu
74f3b9b18d
Merge pull request #20965 from peppy/reduce-slider-blueprint-overhead
...
Only draw path visualiser when hovered or single slider is selected
2022-10-28 16:01:30 +09:00
Dean Herbert
300ffbb500
Don't bother checking for null editorBeatmap
2022-10-28 14:35:55 +09:00
Dean Herbert
10c658e440
Ensure updateVisualDefinition is called once on load
...
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2022-10-28 14:34:24 +09:00
Bartłomiej Dach
d657005ffa
Merge branch 'master' into avoid-unnecessary-path-updates
2022-10-27 20:07:46 +02:00
Dean Herbert
7faf5cd1f6
Fix one more null edge case
2022-10-28 01:20:17 +09:00
Dean Herbert
e582d9d5a8
Remove unused using statements
2022-10-28 01:17:09 +09:00
Dean Herbert
361153f598
Fix nullref in tests due to missing EditorBeatmap dependency
2022-10-27 19:05:50 +09:00
Dean Herbert
39e0362db1
Reduce size of spinner blueprint to better represent gameplay size
2022-10-27 16:15:22 +09:00
Dean Herbert
0c7672e124
Avoid unnecessarily refreshing SliderBodyPiece's path
2022-10-27 16:02:04 +09:00
Dean Herbert
2f172b66cf
Block hover if a multi-selection is made to avoid overlapping path visualisers
2022-10-27 14:52:46 +09:00
Dean Herbert
097d310d74
Only draw path visualiser when hovered or single slider is selected
2022-10-27 14:40:14 +09:00
Bartłomiej Dach
4db01fc970
Merge branch 'master' into fix-time-snapping-when-nearby-objects
2022-10-26 23:31:17 +02:00
Bartłomiej Dach
8b8d0c2293
Fix typo in comment
2022-10-26 23:30:14 +02:00
Dean Herbert
d03161ec01
Apply distance snap time component even when nearby object snap kicks in
2022-10-26 14:39:39 +09:00
Dean Herbert
7d59bc6e2f
Merge branch 'grid-momentary-shortcuts' into read-current-distance-snap
2022-10-26 13:28:04 +09:00
Dean Herbert
54ae16badc
Move distance snap toggle button implementation to DistancedHitObjectComposer
2022-10-26 13:27:23 +09:00
Dean Herbert
2f0283e4d4
Simplify logic with new multi-grid snap support
2022-10-25 14:22:30 +09:00
Dean Herbert
2b850694fa
Merge branch 'allow-distance-grid-snap' into grid-momentary-shortcuts
2022-10-25 14:10:45 +09:00
Dean Herbert
02a3f8c17f
Allow both distance snap and grid snap to be applied at the same time
2022-10-25 14:09:22 +09:00
Dean Herbert
645a84b1d6
Display current distance snap and add button to update to use it
2022-10-21 22:58:36 +09:00
Dean Herbert
ca91f9f716
Don't allow two momentary toggles at the same time to avoid edge cases
2022-10-21 17:16:55 +09:00
Dean Herbert
ef990c55ca
Handle distance/grid toggles based on key type, rathern than individual left/right
2022-10-21 16:11:19 +09:00
Dean Herbert
966dd786ae
Don't consume keys when handling momentary snap toggles
2022-10-20 00:00:24 +09:00
Dean Herbert
830b92d3ae
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
2022-10-19 20:06:41 +09:00
Dean Herbert
6a7f6c76ff
Fix osu! editor padding being applied to toolboxes
...
The result of https://github.com/ppy/osu/pull/20739 and https://github.com/ppy/osu/pull/20738 having unintended side effects when applied together.
2022-10-18 14:32:00 +09:00
OliBomby
b22e201289
Fixed stream convert float precision edge case
2022-10-08 23:43:23 +02:00
B3nn1
112bbe2296
Always use Parent.ToScreenSpace() in PathControlPointVisualiser
2022-09-21 18:56:22 +02:00
B3nn1
5d54354588
Add missing ToScreenSpace() call
2022-09-21 18:53:25 +02:00
B3nn1
368229f324
Remove unnecessary brackets
2022-09-21 01:25:01 +02:00
B3nn1
fe9e8635fc
Fix snapping of already existing slider control points in the editor
2022-09-21 01:04:39 +02:00
B3nn1
b0a3c9152a
Enable snapping for slider control points in the editor
2022-09-19 21:33:38 +02:00
Dean Herbert
4af76b9f48
Apply the same change to HandleFlip
2022-09-15 19:55:18 +09:00
Dean Herbert
c203a030c1
Update osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
...
Co-authored-by: apollo <83023433+apollo-dw@users.noreply.github.com>
2022-09-15 04:28:07 +09:00
Dean Herbert
87384db872
Fix slider rotation causing thousands of new drawables to be created
2022-09-15 00:51:08 +09:00
Dean Herbert
89e128c0f3
Fix bindable event binds to HitObject directly
2022-09-12 17:35:56 +09:00
Dean Herbert
f1d9b225a7
Remove probably pointless comment
2022-09-05 16:40:10 +09:00
Dean Herbert
8af8adf22d
Fix incorrect slider length in timeline when non-default velocity is inherited from previous object
2022-09-05 16:17:26 +09:00
Dean Herbert
a15ea71aed
Merge branch 'master' into fix-merge-crash
2022-08-31 13:28:57 +09:00
OliBomby
44916c51d7
Updated canMerge check to be totally accurate
2022-08-30 00:18:55 +02:00
Dean Herbert
2e5770be4e
Move helper method to bottom of class
2022-08-30 02:51:42 +09:00
OliBomby
d50e9caa11
Moved guards to separate canMerge method
2022-08-29 18:58:29 +02:00
OliBomby
a296c1ec81
remove call to changeHandler BeginChange
2022-08-29 16:05:35 +02:00
OliBomby
ff2eac79d1
fix same time merge causing crash
2022-08-27 17:43:32 +02:00
OliBomby
16e0ec2f88
Fixed 0 length merge being allowed
2022-08-27 13:53:50 +02:00
Dean Herbert
69cbc0125b
Merge pull request #19964 from nanashi-1/merge-hitobject-hitsound-fix
...
Fix hitobjects merge feature in editor not adding any hitsounds
2022-08-26 20:05:02 +09:00
Dean Herbert
03dcfed384
Merge branch 'master' into slider-splitter
2022-08-26 19:10:33 +09:00
Dean Herbert
47cb163015
Refactor splitting logic and comments slightly
2022-08-26 19:09:03 +09:00
Dean Herbert
f54047d17b
Move selection clearing to top
2022-08-26 18:55:20 +09:00
nanashi
4fc96f0389
Merge branch 'ppy:master' into merge-hitobject-hitsound-fix
2022-08-25 19:34:05 +08:00
nanashi-1
2d2bfac5e9
used firstHitObject.Samples as samples for mergedHitObject
2022-08-25 17:49:38 +08:00
Dean Herbert
3ca4bdc087
Add ToArray() calls to removal iteration for safety
2022-08-25 15:13:38 +09:00
Dean Herbert
091c51e664
Fix SliderPath.Version bindings not being correctly cleaned up on path changes
2022-08-25 15:00:32 +09:00
OliBomby
631ea9a3ed
added a gap between objects and made it theoretically possible to retain sample control point
2022-08-23 23:29:59 +02:00
OliBomby
1f9cdff013
remove these lines
2022-08-23 22:19:40 +02:00
Dean Herbert
885ea4270b
Reorder context menu items and tidy up surrounding code
2022-08-20 14:03:54 +09:00
Dean Herbert
36e202c70e
Add inline comment explaining necessity to use AddRange for slider transform operations
2022-08-20 11:38:43 +09:00
OliBomby
65f7ecec83
moving all controlpoints at once for slider
2022-08-20 00:26:04 +02:00
OliBomby
d1519343f6
Improved visual tests for slider splitting
2022-08-19 18:29:01 +02:00
OliBomby
89eb0a4079
Added TestScene for slider splitting
2022-08-19 01:10:54 +02:00
OliBomby
cb6339a20b
added slider splitting option
2022-08-18 01:29:03 +02:00
Dean Herbert
615c5cf6ae
Merge branch 'master' into slider-merger
2022-08-17 13:36:15 +09:00
Dean Herbert
0ff5547b83
Make changeHandler optional in convertToStream method to match new implementation
2022-08-17 13:35:44 +09:00
Dean Herbert
ee153a345c
Add a few more overlooked beatmap save states on setup screen modifications
2022-08-16 16:31:56 +09:00
Dean Herbert
0833a6fb9a
Avoid multiple iteration of LINQ query using a local
2022-08-16 15:39:23 +09:00
Dean Herbert
7cc9fdbaa0
Simplify context menu check by using existing mergeable object list
2022-08-16 15:39:23 +09:00
Dean Herbert
ecb9351bab
Remove unnecessary null pre-checks
2022-08-16 15:36:43 +09:00
Dean Herbert
e636fcd9b8
Use DI'd components from parent class rather than fetching locally
2022-08-16 15:35:32 +09:00
OliBomby
3abc333813
added hotkey for merging selection
2022-08-15 17:18:55 +02:00
OliBomby
3525dfb0f1
added merging feature
2022-08-12 01:17:33 +02:00
Dean Herbert
06ae30a7d2
Fix slider velocity not using previous value if slider is not adjacent
2022-07-19 22:54:11 +09:00
Dean Herbert
31a447fda0
Update parameter discards
2022-06-24 21:26:19 +09:00
Dan Balasescu
f8830c6850
Automated #nullable processing
2022-06-17 16:37:17 +09:00
Dan Balasescu
64a371638e
Merge pull request #18236 from peppy/snap-unification
...
Add `enum` to snap method as alternative to multiple nested invocations
2022-05-20 11:35:05 +09:00
Dean Herbert
cf3ead8047
Remove unused local
2022-05-13 22:06:30 +09:00
Dean Herbert
d9782b5ef6
Remove redundant parenthesis
2022-05-13 21:31:49 +09:00
Dean Herbert
38b8baf095
Remove unused border colour
2022-05-13 21:28:50 +09:00
Dean Herbert
1529162318
Remove circle scaling (apparently the fixed scale is required for spacing)
2022-05-13 21:28:45 +09:00
Dean Herbert
0318944b80
Fix incorrect alive criteria causing clicking future objects to be too greedy
2022-05-12 23:37:29 +09:00
Dean Herbert
0c335592b3
Tidy up interpolation and move const to new home
2022-05-12 19:44:07 +09:00
Dean Herbert
f22ff4e087
Remove editor animation toggling (replaced by overlap markers)
2022-05-12 19:28:56 +09:00
Dean Herbert
be3d4c9bf5
Add circle overlap marker, bringing back stable-like visibility of circles in the past
2022-05-12 19:27:32 +09:00
Dean Herbert
1b2c07e142
Extend lifetime of OsuSelectionBlueprint to allow for lingering display
2022-05-12 19:25:51 +09:00
Dean Herbert
c0abce918f
Add enum to snap method as alternative to mutliple nested invocations
2022-05-12 16:19:07 +09:00
Dean Herbert
c7e7aa5962
Don't draw distance snap grid on the start time of the next object
2022-05-06 17:05:52 +09:00
Dean Herbert
19cf9dc20b
Merge branch 'snapping-tidy-distance'
2022-05-05 16:51:32 +09:00
Dean Herbert
977e6d8a80
Add xmldoc for IDistanceSnapProvider and related properties
2022-05-05 16:25:45 +09:00
Dean Herbert
f6fc926f1a
Add xmldoc and rename methods in IPositionSnapProvider for legibility
2022-05-05 15:58:21 +09:00
Dean Herbert
bb086800b1
Remove ugly playfield border
2022-05-04 13:41:30 +09:00
Salman Ahmed
835898dd30
Introduce DistancedHitObjectComposer and supersede OsuToolboxComposite
2022-04-28 06:44:50 +03:00
Salman Ahmed
59cf3ff50f
Move distancing methods from IPositionSnapProvider to IDistanceSnapProvider
2022-04-28 05:48:45 +03:00
Salman Ahmed
66c730c382
Change distance spacing keybind to Ctrl+Alt
2022-04-27 17:11:23 +03:00
Salman Ahmed
0738cd028f
Give snapping toolbox enough hover delay for interaction with expand button
...
With 0 delay, if the `SettingsToolboxGroup` has been contracted via
button, there's no chance to be able to expand it via button again.
This is temporary at best just to keep things working somewhat, not sure
if the expansion logic will still be required in editor redesign, so
deciding to roll with it for now.
2022-04-24 08:53:11 +03:00
Salman Ahmed
8ed39009fd
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.
2022-04-24 08:33:03 +03:00
Salman Ahmed
19ee05c232
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.
2022-02-15 02:21:53 +03:00
Susko3
19467e58c1
Remove unused params from BDL methods
2022-01-15 01:06:39 +01:00
Bartłomiej Dach
c09f6ee052
Use slider snapping more liberally to match user expectations
...
Previously the slider path length would be snapped using the current
beat snap setting on *every* change of the slider path. As it turns out
this is unexpected behaviour in some situations (e.g. when reversing a
path, which is expected to preserve the previous duration, even though
the slider may be technically "unsnapped" at that point in time due to a
different beat snap setting being selected afterwards).
2022-01-07 16:02:04 +01:00
Dean Herbert
ee24713002
Fix single sliders not being flippable due to incorrect precondition
2022-01-06 14:37:13 +09:00
Dean Herbert
6779503e57
Refactor logic to avoid TimelineSelectionHandler having to block base calls
2022-01-05 16:56:54 +09:00
Dean Herbert
866ae3472b
Add global flip hotkeys
2022-01-05 16:48:07 +09:00
Joseph Madamba
7de43e3aba
Fix most open compound words in identifiers being closed
2021-12-27 20:26:28 -08:00
Bartłomiej Dach
c6a5ac1c5f
Fix control point additions without a drag not being undoable
2021-12-23 09:32:52 +01:00
Bartłomiej Dach
cbda637d66
Fix drag after placement moving last placed point sometimes
...
More specifically, if the left mouse button was just pressed without a
drag, `OnDragEnd()` wouldn't fire, and the next drag would start moving
the last placed control point around regardless of where the mouse was.
2021-12-23 09:25:10 +01:00
Dean Herbert
b0df787b1a
Move public method up and add xmldoc to second public method
2021-12-23 14:13:57 +09:00
Bartłomiej Dach
c3fada1926
Replace assertion with soft null check
...
Surrounding `OnDrag{Start,End}` methods did so already.
2021-12-22 10:33:08 +01:00
Bartłomiej Dach
6330fa5dc5
Select newly created control point
2021-12-22 10:33:07 +01:00
Bartłomiej Dach
e22745397d
Fix right click deselecting clicked path piece with control held
2021-12-22 08:55:26 +01:00
Bartłomiej Dach
e715bff535
Fix selections including head not correctly dragging if not started from head
2021-12-21 12:35:48 +01:00
Bartłomiej Dach
5ef4e23335
Fix selecting control points without control not deselecting other selected points
2021-12-20 22:41:24 +01:00
Bartłomiej Dach
bf8c87e9b7
Fix releasing mouse after drag deselecting dragged point
2021-12-20 22:41:23 +01:00
Bartłomiej Dach
d2417beeac
Implement drag operation for multiple path control points
2021-12-20 21:29:57 +01:00
