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 |
|
smoogipoo
|
3d8ef97e81
|
Add testcase
|
2018-11-12 19:41:06 +09:00 |
|
smoogipoo
|
1403fa26cf
|
Fix placement not working correctly for downwards scroll
|
2018-11-12 19:40:57 +09:00 |
|
smoogipoo
|
1d40a042f6
|
Extract common methods into ManiaPlacementBlueprint
|
2018-11-12 18:32:44 +09:00 |
|
smoogipoo
|
3a1fee59fb
|
Implement note placement
|
2018-11-12 18:24:18 +09:00 |
|
smoogipoo
|
a0c75a0597
|
Merge branch 'notepieces' into note-placement
|
2018-11-12 17:59:54 +09:00 |
|
smoogipoo
|
e302d5d005
|
Separate NoteSelectionBlueprint into a note piece
|
2018-11-12 17:59:39 +09:00 |
|
smoogipoo
|
8be6e351f5
|
Merge branch 'fix-mania-selections' into add-mania-selection-testcase
|
2018-11-12 17:39:58 +09:00 |
|
smoogipoo
|
9fde7f7f44
|
Move scrolling info to osu.Game
|
2018-11-12 17:34:35 +09:00 |
|
smoogipoo
|
e3c60c2f96
|
Cleanups
|
2018-11-12 17:18:58 +09:00 |
|
Dean Herbert
|
03af600273
|
Merge remote-tracking branch 'upstream/master' into fix-mania-selections
|
2018-11-09 11:35:46 +09:00 |
|
smoogipoo
|
d0b63e8f8d
|
Fix missing references
|
2018-11-08 14:13:57 +09:00 |
|
smoogipoo
|
21f8a0a56f
|
Fix selection box using an incorrect size
|
2018-11-08 14:02:07 +09:00 |
|
smoogipoo
|
4b1b494893
|
Fix selection masks not having the correct size
|
2018-11-08 14:02:07 +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 |
|