1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-28 12:02:55 +08:00
Commit Graph

128 Commits

Author SHA1 Message Date
smoogipoo
575b061dd7 Add change state support to more editor components 2020-04-09 22:02:42 +09:00
Dean Herbert
7c62cc3ac3 Merge remote-tracking branch 'smoogipoo/void-mouse-up-returns' into update-framework 2020-01-22 22:57:52 +09:00
smoogipoo
7b2f58eb30 Apply OnRelease method signature refactorings 2020-01-22 13:22:34 +09:00
smoogipoo
bfb056c612 Apply input method signature refactorings 2020-01-20 18:17:21 +09:00
Dean Herbert
42a01a10dd Merge remote-tracking branch 'upstream/master' into separate-path-connection 2019-12-11 20:14:29 +09:00
Dean Herbert
50377e7286 Add summary xmldoc 2019-12-11 20:14:16 +09:00
Dean Herbert
47b6b01739 Rename class to signify it is a drawable 2019-12-11 20:11:48 +09:00
Dean Herbert
d027c982e4
Merge branch 'master' into separate-path-connection 2019-12-11 19:03:14 +09:00
Dean Herbert
23959f3a3c Move control point removal to SliderSelectionBlueprint 2019-12-11 18:58:35 +09:00
Dean Herbert
d82ba3e7f7 Curve -> Curve type 2019-12-11 18:20:28 +09:00
Dean Herbert
03040d1750 Don't show inherit menu item when first control point is selected 2019-12-11 18:18:16 +09:00
Dean Herbert
97ca2e2753 Add missing bezier option to menu 2019-12-11 17:58:59 +09:00
Dean Herbert
cda6757f52
Merge branch 'master' into path-type-menuitem 2019-12-11 16:43:55 +09:00
Dean Herbert
f515bdc599
Merge branch 'master' into separate-path-connection 2019-12-11 16:43:04 +09:00
Dan Balasescu
42a979b495
Merge branch 'master' into path-visualiser-refactor 2019-12-10 16:33:45 +09:00
Dean Herbert
5f3d163772
Merge branch 'master' into segmented-slider-paths-3 2019-12-10 14:28:20 +09:00
smoogipoo
e9ec6591a9 Separate path connections from control points 2019-12-10 11:20:08 +09:00
Dean Herbert
1db218f908 Don't show count when deleting only one control point
Reads better.
2019-12-10 03:29:25 +09:00
smoogipoo
1b14b0e5b6 Fix pieces blocking context menu 2019-12-10 00:08:38 +09:00
smoogipoo
9b318d2869 Add right-click menu item to change path type 2019-12-10 00:07:07 +09:00
smoogipoo
0ee303f7d6 Remove unused using 2019-12-09 22:45:44 +09:00
smoogipoo
bd2b0af269 Consider having only 1 control point as being deleted 2019-12-09 22:36:19 +09:00
smoogipoo
af90b45c40 Refactor path visualisers to use bindables 2019-12-09 20:49:59 +09:00
smoogipoo
883d5bc11d Remove automatic slider path offsetting 2019-12-09 17:54:22 +09:00
smoogipoo
53f7c753fb General cleanups 2019-12-09 16:44:19 +09:00
smoogipoo
4905709ea4 Remove unused usings 2019-12-09 13:19:21 +09:00
smoogipoo
52dd7bf716 Fix deleting the first control point not working 2019-12-06 18:49:14 +09:00
smoogipoo
16f8341a02 Handle control point positional updates within SliderPath 2019-12-06 18:49:01 +09:00
smoogipoo
2b5f9515de Fix multiple control point deletions 2019-12-06 17:03:54 +09:00
smoogipoo
247609388f Clean up unused/unnecessary properties 2019-12-06 12:31:22 +09:00
smoogipoo
3ebbf62b2a Initial game-wide update with the new SliderPath 2019-12-05 19:53:36 +09:00
Huo Yaoyuan
818553027b Merge branch 'master' into sharpen 2019-11-21 23:42:46 +08:00
smoogipoo
031b686ee9 Only accept input while hovered 2019-11-13 17:38:34 +09:00
smoogipoo
d835def4ab Add point count to the menu item text 2019-11-13 17:36:46 +09:00
smoogipoo
c56503ee88 Select single control point on right click 2019-11-13 17:29:00 +09:00
smoogipoo
9c52d239b4 Return null to allow passthrough 2019-11-13 16:56:48 +09:00
smoogipoo
4c0bca5c07 Add ability to delete control points via right-click option 2019-11-13 16:38:15 +09:00
Huo Yaoyuan
7d7b9e36b2 Use compound assignment. 2019-11-12 19:53:50 +08:00
smoogipoo
b1da81571f Implement slider head control point snapping 2019-11-07 14:00:12 +09:00
Dean Herbert
52dba69a64
Implement slider control point deletion (#6679)
Implement slider control point deletion

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-05 19:15:15 +09:00
smoogipoo
d77882c21b Fix slider selection input handled outside path 2019-11-05 17:31:52 +09:00
smoogipoo
7c20a589f2 Remove unused usings 2019-11-05 13:56:21 +09:00
smoogipoo
c8beb5296f Use PlatformAction.Delete instead of Delete key 2019-11-05 13:26:44 +09:00
smoogipoo
08bd811326 Merge remote-tracking branch 'origin/master' into slider-controlpoint-deletion
# Conflicts:
#	osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
2019-11-05 13:07:06 +09:00
Dean Herbert
66253a0bd4 Handle selection on mouse down instead of click
This is how other elements work, and feels better with drag preselection
2019-11-05 02:21:50 +09:00
Dean Herbert
bcf8a6d514 Fix slider creation regressing with path selection changes 2019-11-03 19:59:37 +09:00
Dean Herbert
f849926049
Merge branch 'master' into slider-controlpoint-deletion 2019-11-03 19:05:17 +09:00
Dean Herbert
4dbdfcdd3c Change control to toggle rather than always select 2019-11-03 18:41:29 +09:00
smoogipoo
18f374eec6 Deselect deleted control points 2019-10-31 17:58:33 +09:00
smoogipoo
78194cfa6e Implement slider control point deletions 2019-10-31 17:54:09 +09:00
smoogipoo
43b2cbb865 Implement slider control point deletion 2019-10-31 17:39:57 +09:00
smoogipoo
20aeb7aaff Implement multiple selection 2019-10-31 17:25:30 +09:00
smoogipoo
8d50b155e8 Make selection happen on click only 2019-10-31 17:13:10 +09:00
smoogipoo
cfdf710676 Add test 2019-10-31 16:51:58 +09:00
smoogipoo
e23a75c64a Implement control point selection 2019-10-31 16:23:54 +09:00
smoogipoo
0af5706db6 Snap path during control point movement 2019-10-24 19:02:59 +09:00
smoogipoo
bddaead72e Make hitobject pieces able to update dynamically 2019-09-27 18:45:22 +09:00
smoogipoo
4fc37d1137 Remove SliderPiece + HitObjectPiece 2019-09-27 18:01:55 +09:00
smoogipoo
f64fe22f36 Remove bindables from osu! selection blueprints 2019-09-27 18:00:24 +09:00
Dean Herbert
e50b70d615 Centralise osu! circle radius specification 2019-07-22 14:40:02 +09:00
Dean Herbert
c39c37a18d Apply more missed cases 2019-04-01 12:44:46 +09:00
Dean Herbert
340997f505 Rename remaining usage of PathWidth naming convention 2019-03-07 20:21:59 +09:00
David Zhao
b3e046c4d1 Rename PathWidth to PathRadius 2019-03-07 17:39:19 +09:00
Dean Herbert
367bc53a06 Revert some more instances of 'e' variable names 2019-02-22 20:15:25 +09:00
smoogipoo
d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
smoogipoo
bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
smoogipoo
050af88be9 Fix post-merge issues 2018-11-14 14:29:22 +09:00
smoogipoo
29422345f7 Merge remote-tracking branch 'origin/master' into fix-mask-disposal
# Conflicts:
#	osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
#	osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderCirclePiece.cs
#	osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
#	osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
#	osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
#	osu.Game.Rulesets.Osu/Objects/Slider.cs
2018-11-14 14:03:25 +09:00
smoogipoo
f3ba429701 Make sure control points is internally initialised 2018-11-12 17:14:06 +09:00
smoogipoo
d594ce3530 Revert "Make SliderPath.ControlPoints read-only"
This reverts commit 3b88d94793.

# Conflicts:
#	osu.Game/Rulesets/Objects/SliderPath.cs
2018-11-12 16:20:38 +09:00
smoogipoo
3b88d94793 Make SliderPath.ControlPoints read-only 2018-11-12 14:03:54 +09:00
smoogipoo
51e4feeda7 Adjust to new path structure 2018-11-12 13:55:14 +09:00
smoogipoo
54ab256c8e Instantiate a new path rather than setting properties on it
# Conflicts:
#	osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
#	osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
#	osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
#	osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/SliderPath.cs
2018-11-12 13:50:19 +09:00
smoogipoo
13279f707b Cleanups 2018-11-09 14:19:50 +09:00
smoogipoo
cc8531790a Use bindables for hitobject events 2018-11-09 13:58:46 +09:00
smoogipoo
2612fd3099 Adjust ruleset-specific namespaces 2018-11-07 16:10:21 +09:00