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

65 Commits

Author SHA1 Message Date
smoogipoo
1f9f03dc66 Add temporary fix for null references 2019-11-07 13:36:54 +09:00
smoogipoo
8d42e45fd3 Make holdnote notes update lazily 2019-11-07 13:23:00 +09:00
smoogipoo
8141509a71 Split hold note blueprints into separate file 2019-11-07 12:59:05 +09:00
smoogipoo
38c2c328ff Rename HitObject -> DrawableObject in selection blueprints 2019-10-21 17:04:56 +09:00
Dean Herbert
d0eaf629af
Merge branch 'master' into dho-apply 2019-10-18 19:45:10 +09:00
smoogipoo
510ce9345f Fix potential blueprint nullrefs with the new structure 2019-10-17 16:14:28 +09:00
smoogipoo
79b2c7b480 Make BeginPlacement() set the hitobject start time 2019-10-16 20:04:15 +09:00
smoogipoo
08d043f447 Move selection relative to the hitobject start positions 2019-10-08 18:57:03 +09:00
Dean Herbert
0fdb07346b
Merge branch 'master' into fix-mania-placement 2019-10-06 14:22:03 +08:00
smoogipoo
80585d446c Split applyPositionOffset into two methods and add xmldocs 2019-10-03 18:40:48 +09:00
smoogipoo
f1ff22cf8b Fix hold note blueprint placing in the wrong direction 2019-10-03 18:40:48 +09:00
smoogipoo
39369620fa Remove position offset from ColumnAt 2019-10-03 18:40:48 +09:00
smoogipoo
0a409075be Fix note placement offset not working for down-scroll 2019-10-03 18:40:48 +09:00
smoogipoo
754fbc59e1 Fix note placement being offset 2019-10-03 18:40:48 +09:00
smoogipoo
652acac87f Move placement movement event to BlueprintContainer 2019-10-03 16:14:42 +09:00
smoogipoo
d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Dean Herbert
a1666fb7fa MouseDownPosition -> DragPosition 2018-11-30 14:21:20 +09:00
Dean Herbert
5254b07680 Merge remote-tracking branch 'upstream/master' into inter-column-movements 2018-11-30 11:57:53 +09:00
Dean Herbert
085acf29a0 Fix blueprints behaving incorrectly 2018-11-29 19:29:36 +09:00
Dean Herbert
ab0ce46362 Make hold note placement blueprints look a bit more blueprint-y 2018-11-29 18:13:15 +09:00
Dean Herbert
132d334e15 Merge branch 'master' into hold-note-placement 2018-11-29 17:02:55 +09:00
Dean Herbert
d1c976880c Fix incorrect margin/spacing handling 2018-11-29 14:15:28 +09:00
smoogipoo
f9f300b215 Fix drag breaking if scrolling while dragging 2018-11-26 16:08:56 +09:00
Dean Herbert
bfebed053d
Merge branch 'master' into note-placement 2018-11-26 14:19:46 +09:00
smoogipoo
60ffad169f Fix post-merge errors 2018-11-26 11:47:48 +09:00
smoogipoo
c0fcbc283e Merge branch 'note-placement' into inter-column-movements
# Conflicts:
#	osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
2018-11-26 11:47:22 +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
5d6a438f98 Make selected mania hitobjects always alive 2018-11-26 11:34:25 +09:00
smoogipoo
4ba3fa4ab6 osuTK 2018-11-26 10:44:48 +09:00
Dean Herbert
1da2006dea
Merge branch 'master' into note-placement 2018-11-22 19:44:39 +09:00
Dean Herbert
7de85659ba Merge branch 'master' into mania-selection-movement 2018-11-21 20:00:46 +09:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
smoogipoo
2ee56e4a78 Add a body piece 2018-11-19 18:59:05 +09:00
smoogipoo
ad950cfc90 Implement hold note placement 2018-11-19 18:40:43 +09:00
smoogipoo
8071244d97 Make sizing happen per-blueprint 2018-11-19 18:40:27 +09:00
Dan Balasescu
d9b8d2d15c
Trim whitespace 2018-11-19 18:05:21 +09:00
smoogipoo
d1cbaa9612 Use the column width 2018-11-19 18:02:01 +09:00
smoogipoo
52309465eb Apply some simple fixes 2018-11-19 17:59:52 +09:00
smoogipoo
4cbda97b1e Move positional adjustment to SelectionBox 2018-11-16 17:12:24 +09:00
smoogipoo
f7fc2ca569 Basic inter-column selection movement 2018-11-15 21:37:22 +09:00
smoogipoo
df7515b66f Pass all selected hitobjects to the selection blueprints 2018-11-15 21:01:09 +09:00
smoogipoo
eddba44d0f Merge branch 'note-placement' into inter-column-movements 2018-11-15 20:53:57 +09:00
smoogipoo
63642586c4 Merge remote-tracking branch 'origin/master' into mania-selection-movement 2018-11-15 20:47:53 +09:00
Dean Herbert
3fbabdfed2
Merge branch 'master' into notepieces 2018-11-14 17:30:39 +09:00
Dean Herbert
a1dd1057ce
Merge branch 'master' into more-global-scrollalgo 2018-11-14 17:15:24 +09:00
Dean Herbert
8b190edde0
Merge branch 'master' into more-global-scrollalgo 2018-11-14 13:32:14 +09:00
smoogipoo
a9a33b1fcb Implement mania selection movements 2018-11-13 16:42:40 +09:00
smoogipoo
fc0030a391 Use common positional adjustment for note blueprints 2018-11-13 15:45:06 +09:00
smoogipoo
25101ecd2c Snap placement blueprint to columns 2018-11-13 14:13:29 +09:00