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

35 Commits

Author SHA1 Message Date
smoogipoo
1139f0dbf2 Centralise method of disabling playfield judgements 2018-07-20 17:04:33 +09:00
smoogipoo
268c14813b Fix resharper warnings 2018-05-07 11:38:41 +09:00
smoogipoo
4ecdea8b2e Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer 2018-05-07 10:17:54 +09:00
smoogipoo
c9e4a07e12 Merge remote-tracking branch 'origin/master' into remove-approachcircle-hax
# Conflicts:
#	osu.Game.Rulesets.Osu/Edit/OsuEditPlayfield.cs
#	osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
2018-04-20 18:04:43 +09:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
smoogipoo
cea3e1c7f5 Remove now unnecessary approachcircle proxy disables
Prereqs:
- [ ] ppy/osu-framework#1505
2018-04-09 18:44:50 +09:00
Dean Herbert
6c125683d4
Merge branch 'master' into selectionlayer-rewrite 2018-04-04 20:47:36 +09:00
Dean Herbert
b7325d73e8 Don't inherit VisbilityContainer 2018-04-04 20:44:11 +09:00
smoogipoo
d4cb00e08f Don't display judgements in OsuEditPlayfield 2018-04-04 17:12:41 +09:00
smoogipoo
4ad776bfde Make slider circle masks not handle mouse input at all 2018-03-30 14:15:46 +09:00
smoogipoo
3129c2cc75 Fix slider circle masks blocking input for now 2018-03-29 22:41:49 +09:00
smoogipoo
6d4f94756e Rewrite the way drag + click selections happen
The general idea here is that we need the masks to handle mouse down events, as they need to handle the drag (mousedown -> drag immediately).

I've rewritten the editor selections to use events, as there are some 3 different components that handle/trigger selections in different ways.

1. All selections/deselections now propagate through `HitObjectMask.Select()`/`HitObjectMask.Deselect()`.
2. Components that react to changes in the selection bind to the masks' `Selected`/`Deselected` events, and track them/change their states locally.
3. Masks provide a `SingleSelectionRequested` event which is invoked on the mouse-down event. Various components bind to this event to perform state changes locally in this scenario.
4. `DragBox` now handles all drag input locally. It triggers `Select`/`Deselect` on the masks it needs to.
5. `SelectionBox` handles the display of itself locally.
6. `SelectionBox` handles movement of groups of masks locally.
7. `HitObjectMasks` handles movement of itself locally.
2018-03-29 22:07:23 +09:00
Dean Herbert
a0691168cb Merge remote-tracking branch 'upstream/master' into editor-hitobject-movement 2018-03-14 15:35:24 +09:00
Dean Herbert
81f82d98a1 Rework a lot of naming and structure 2018-03-14 15:18:21 +09:00
smoogipoo
8c4bcb4a04 Only accept drag movement on the overlays 2018-03-12 17:33:10 +09:00
smoogipoo
2d9fcdcbd0 Fix slider circle overlays moving with the endpoints 2018-03-12 17:18:50 +09:00
smoogipoo
4a48136e4f Make hitobject positions adjustable 2018-03-09 23:12:34 +09:00
smoogipoo
e62fab6cc2 Fix overlay positions/sizes due to sliders now being fixed 2018-03-01 14:34:31 +09:00
Dan Balasescu
6cc54a464c
Merge branch 'master' into editor-hitobject-overlays 2018-02-22 14:25:27 +09:00
smoogipoo
844e87aafe Use the true head position rather than capturing current position 2018-02-22 14:25:10 +09:00
Dean Herbert
a3336f2577
Merge branch 'master' into fix-editor-osu-scale 2018-02-22 14:14:41 +09:00
smoogipoo
604b0fa20a Fix post-merge issues 2018-02-22 14:11:06 +09:00
smoogipoo
5faec5c2f1 Add a separate property to control playfield area 2018-02-21 20:54:33 +09:00
smoogipoo
9a9f53ddfd Remove 0.75 scale from osu! playfield in the editor 2018-02-21 11:10:43 +09:00
smoogipoo
4934ef7429 Add playfield aspect ratio + scaling modifications to composer layers 2018-02-21 11:07:42 +09:00
smoogipoo
ad2f556133 Add hitobject overlays to selected hitobjects 2018-02-20 18:01:45 +09:00
smoogipoo
8f25a5da66 Add playfield aspect ratio + scaling modifications to composer layers 2018-02-20 14:01:33 +09:00
smoogipoo
512e4d2c9f Rewrite the way that cursor overrides are done game-wide 2018-01-12 18:13:17 +09:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
smoogipoo
def2e5bd17 Make editor discard approach circles
Temporary solution for now.
2017-12-22 22:16:54 +09:00
smoogipoo
677f3653eb Hide osu! playfield cursor 2017-11-30 19:19:34 +09:00
smoogipoo
efa39f38ca CI fixes 2017-11-30 18:49:08 +09:00
smoogipoo
456bbe25f3 Implement toolbox into HitObjectComposer 2017-11-30 16:58:14 +09:00
smoogipoo
309eb4edd7 Integrate HitObjectComposer into Compose
Also removes the other rulesets' HitObjectComposers for now.
2017-11-29 17:46:21 +09:00
smoogipoo
8c30fd490c Add HitObjectComposer class 2017-11-29 16:22:11 +09:00