Commit Graph

130 Commits

Author SHA1 Message Date
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
ProgrammaticNajel 2058604ef3 Typo fix 2019-01-26 23:10:13 +08:00
ProgrammaticNajel 0797f5d644 Update SliderPlacementBlueprint.cs 2019-01-26 22:56:31 +08:00
ProgrammaticNajel e71b13683a Add null check 2019-01-26 22:55:33 +08:00
ProgrammaticNajel e939f75f4b Transform screen mouse coordinates to local space coordinates. 2019-01-26 18:19:01 +08:00
Dean Herbert 8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
smoogipoo f9f300b215 Fix drag breaking if scrolling while dragging 2018-11-26 16:08:56 +09:00
smoogipoo 56032a4522 Merge branch 'mania-selection-movement' into inter-column-movements
# Conflicts:
#	osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
#	osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
2018-11-26 11:45:48 +09:00
smoogipoo f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
smoogipoo 55edeb095d SelectionBox -> SelectionHandler 2018-11-19 16:58:11 +09:00
smoogipoo 4cbda97b1e Move positional adjustment to SelectionBox 2018-11-16 17:12:24 +09:00
smoogipoo df7515b66f Pass all selected hitobjects to the selection blueprints 2018-11-15 21:01:09 +09:00
Dean Herbert 1501e05c04
Merge branch 'master' into fix-mask-disposal 2018-11-14 21:27:37 +09:00
Dean Herbert 84d16ee71b
Merge branch 'master' into placement-hiding 2018-11-14 16:59:41 +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 819cba31ce Fix spinners not starting placement with the first click 2018-11-13 12:52:44 +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 5d51719572 Make selection blueprints handle position adjustments 2018-11-07 16:21:32 +09:00
smoogipoo 2612fd3099 Adjust ruleset-specific namespaces 2018-11-07 16:10:21 +09:00
smoogipoo 85f96ad62f Fix a few missed renames 2018-11-06 18:07:53 +09:00
smoogipoo bd775af274 PlacementMask -> PlacementBlueprint 2018-11-06 18:04:03 +09:00
smoogipoo 11be820efe CreateMaskFor -> CreateBlueprintFor 2018-11-06 18:03:21 +09:00
smoogipoo f2a5f28ea2 SelectionMask -> SelectionBlueprint 2018-11-06 17:56:04 +09:00
Dean Herbert 63cbc8e0e8
Merge branch 'master' into slider-placement 2018-11-02 19:45:34 +09:00
Dean Herbert e6ee3dc73e Use framework helper functions for path approximation 2018-11-02 19:26:29 +09:00
smoogipoo 2ac4f2b6af Lock spinners to centre of screen 2018-11-01 19:24:58 +09:00
smoogipoo d78348f178 Reduce duplicate code 2018-11-01 19:23:37 +09:00
smoogipoo 1aae123ff5 Make approximators share an interface 2018-11-01 19:16:44 +09:00
Dean Herbert 1265d5ac0b
Merge branch 'master' into spinner-placement-2 2018-11-01 18:05:44 +09:00
Dean Herbert c1304eca1b Merge remote-tracking branch 'upstream/master' into slider-placement 2018-11-01 17:59:37 +09:00
Dean Herbert bb2f8deb18 ControlPoint -> PathControlPoint
Also Curve -> Path.
2018-11-01 03:56:51 +09:00
smoogipoo ffec532079 Fix segment control points not changing in unison 2018-10-31 19:02:47 +09:00
smoogipoo d2fbf05137 Reduce size of control point 2018-10-31 18:01:53 +09:00
smoogipoo aec1d95f04 Implement spinner placement 2018-10-29 18:37:28 +09:00
smoogipoo e04ad8357d Make spinner piece respond to scale changes 2018-10-29 18:37:12 +09:00
smoogipoo af1de01ed6 Add a spinner selection mask 2018-10-29 18:23:23 +09:00
smoogipoo 2ae7b42244 Fix control points disappearing if moved offscreen 2018-10-29 16:15:15 +09:00
smoogipoo 5998d6454b Use ControlPointVisualiser instead of custom implementation 2018-10-29 15:56:17 +09:00
smoogipoo 08b16be3b8 Merge branch 'slider-controlpoint-masks' into slider-placement
# Conflicts:
#	osu.Game.Rulesets.Osu/Edit/Masks/SliderMasks/Components/SliderBodyPiece.cs
#	osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
2018-10-29 15:55:38 +09:00
smoogipoo c1fffde10d Fix broken conditional 2018-10-29 15:52:28 +09:00
smoogipoo acd703c27b Make sliders respond to control point changes 2018-10-29 15:36:43 +09:00