Dean Herbert
|
6bc62385b6
|
Merge branch 'master' into slider-controlpoint-selection
|
2019-11-03 15:28:50 +09:00 |
|
Dean Herbert
|
e23ea94383
|
Add one more level of null check
|
2019-11-01 15:33:38 +09:00 |
|
Dean Herbert
|
05002ea3e8
|
Move Show/Hide code to PopIn/PopOut
|
2019-11-01 14:50:38 +09:00 |
|
smoogipoo
|
41ae66d517
|
Update slider when control points change
|
2019-10-31 18:24:38 +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
|
7a3ebcd0b1
|
Fix path changes not updating tail circle
|
2019-10-31 15:52:38 +09:00 |
|
Huo Yaoyuan
|
bcf8e3a9d4
|
Remove redundant properties from desktop projects.
While OutputType=Library maybe doubtful, PlatformTarget=AnyCPU should be clearly the default.
|
2019-10-30 22:56:33 +08:00 |
|
Huo Yaoyuan
|
31595159be
|
Normalize .props
|
2019-10-30 21:54:14 +08:00 |
|
Dean Herbert
|
e9cb3337b3
|
Fix 1x1 white pixel appearing in the centre of hitcircles on default skin
|
2019-10-29 22:31:27 +09:00 |
|
Dean Herbert
|
194e501f86
|
Merge branch 'master' into snapping-refactor
|
2019-10-26 14:20:08 +09:00 |
|
smoogipoo
|
da6ee05dd6
|
Fix not being able to drag non-snaked sliders
|
2019-10-25 18:37:44 +09:00 |
|
smoogipoo
|
607b4d874a
|
Refactor flow of snapping through HitObjectComposer
|
2019-10-25 16:40:30 +09:00 |
|
smoogipoo
|
a6458fdeab
|
Re-use slider type
|
2019-10-24 19:04:24 +09:00 |
|
smoogipoo
|
b7af4acdbf
|
Allow not having a composer
|
2019-10-24 19:04:00 +09:00 |
|
smoogipoo
|
0af5706db6
|
Snap path during control point movement
|
2019-10-24 19:02:59 +09:00 |
|
smoogipoo
|
f45f17339c
|
Implement slider path distance snapping
|
2019-10-24 18:17:30 +09:00 |
|
Dean Herbert
|
ef4dd3e028
|
Merge pull request #6580 from smoogipoo/remove-controlpoint-snap
Don't snap slider control point placement
|
2019-10-24 10:27:16 +09:00 |
|
smoogipoo
|
436941cda3
|
Add comment
|
2019-10-23 17:58:44 +09:00 |
|
Dean Herbert
|
02efd0e943
|
Merge pull request #6556 from smoogipoo/fix-slider-stack-change
Fix sliders not moving with stacking changes
|
2019-10-23 17:48:06 +09:00 |
|
smoogipoo
|
b903edca45
|
Don't snap slider control point placement
|
2019-10-23 16:03:16 +09:00 |
|
smoogipoo
|
54f23cbd0d
|
Update stacking test case values
|
2019-10-23 15:49:36 +09:00 |
|
Dean Herbert
|
e3fa5f1da3
|
Merge branch 'master' into beatsnap-grid-integration
|
2019-10-21 18:44:34 +09:00 |
|
smoogipoo
|
c34d3362df
|
Fix hit circles selection area being too large
|
2019-10-21 17:14:08 +09:00 |
|
Dean Herbert
|
b157aaead1
|
Merge remote-tracking branch 'upstream/master' into beatsnap-grid-integration
|
2019-10-21 17:09:43 +09:00 |
|
smoogipoo
|
38c2c328ff
|
Rename HitObject -> DrawableObject in selection blueprints
|
2019-10-21 17:04:56 +09:00 |
|
smoogipoo
|
5f8d46f666
|
Fix sliders not moving with stacking change
|
2019-10-21 16:24:06 +09:00 |
|
Dean Herbert
|
11e5e0decc
|
Merge branch 'master' into dho-apply
|
2019-10-21 16:05:11 +09:00 |
|
smoogipoo
|
96649e0a6a
|
Fix selection blueprints not respecting stacking
|
2019-10-21 15:03:49 +09:00 |
|
smoogipoo
|
6afc27b1bd
|
Merge remote-tracking branch 'origin/master' into dho-apply
|
2019-10-21 13:47:44 +09:00 |
|
Dan Balasescu
|
c1c803caf4
|
Merge branch 'master' into cursor-size-trail
|
2019-10-21 13:26:13 +09:00 |
|
HoLLy
|
68837d47df
|
Use local bindable instead of using BindValueChanged of external one
|
2019-10-19 12:15:31 +02:00 |
|
HoLLy
|
ca957f0994
|
Hide gameplay cursor when resume overlay is shown
|
2019-10-19 11:52:07 +02:00 |
|
Dean Herbert
|
d0eaf629af
|
Merge branch 'master' into dho-apply
|
2019-10-18 19:45:10 +09:00 |
|
smoogipoo
|
5dd5a070e0
|
Show placement grid from hitobjects at the current time
|
2019-10-18 19:03:19 +09:00 |
|
Dean Herbert
|
99ea45da41
|
Merge pull request #6474 from smoogipoo/osu-beatsnapping-grid
Implement osu!'s beat snapping grid
|
2019-10-18 16:27:03 +09:00 |
|
smoogipoo
|
f1d7e7e7f6
|
Merge branch 'placement-blueprint-starttime' into beatsnap-grid-integration
|
2019-10-18 13:49:09 +09:00 |
|
smoogipoo
|
c4704f6a29
|
Add beat snap grid to the composer
|
2019-10-18 12:47:52 +09:00 |
|
smoogipoo
|
5ccdd2b203
|
Mask the osu! beatsnap grid
|
2019-10-18 12:38:43 +09:00 |
|
smoogipoo
|
c5ee533524
|
Merge branch 'dho-apply' into beatsnap-grid-integration
|
2019-10-18 12:38:29 +09:00 |
|
Dean Herbert
|
f3ed71d336
|
Move scoring distance constant to a central/shared location
|
2019-10-17 16:36:47 +09:00 |
|
Dean Herbert
|
f92331531c
|
Rename grid to DistanceSnap to be more in line with its purpose
|
2019-10-17 15:32:02 +09:00 |
|
smoogipoo
|
bc41eb176e
|
Clean up head/tail setting in various DHOs
|
2019-10-17 14:02:23 +09:00 |
|
smoogipoo
|
f429a8f7c2
|
Add back/obsolete old AddNested() method
|
2019-10-17 14:02:08 +09:00 |
|
smoogipoo
|
d8f3678c3c
|
Rename parameter
|
2019-10-17 12:53:54 +09:00 |
|
smoogipoo
|
3a1acf7b0a
|
Fix slider approach circle proxies
|
2019-10-17 12:50:26 +09:00 |
|
smoogipoo
|
8d7453c251
|
Rework construction of nested hitobjects
|
2019-10-16 22:10:50 +09:00 |
|
smoogipoo
|
4ac2e1c58e
|
Move load() to below ctor()
|
2019-10-16 21:41:18 +09:00 |
|
smoogipoo
|
79b2c7b480
|
Make BeginPlacement() set the hitobject start time
|
2019-10-16 20:04:15 +09:00 |
|
HoLLy
|
13e1199229
|
Move click to resume cursor scaling responsibility to container
|
2019-10-15 22:44:04 +02:00 |
|
HoLLy
|
8c671d7fde
|
Rename cursorScale and calculatedCursorScale
|
2019-10-15 20:12:08 +02:00 |
|
Dean Herbert
|
ae2fe62fd9
|
Use BindValueChanged
|
2019-10-14 17:13:36 +09:00 |
|
Dean Herbert
|
64a6ca28e6
|
Merge branch 'master' into cursor-size-trail
|
2019-10-14 16:35:37 +09:00 |
|
Dean Herbert
|
f3c38ae089
|
Merge branch 'master' into osu-beatsnapping-grid
|
2019-10-13 18:38:57 +09:00 |
|
HoLLy-HaCKeR
|
7931510d7b
|
Ensure OsuResumeCursor can change scale when it is being shown
|
2019-10-12 11:59:22 +02:00 |
|
HoLLy-HaCKeR
|
fdc17d2adb
|
Scale OsuResumeCursor with gameplay cursor
|
2019-10-12 11:51:14 +02:00 |
|
HoLLy-HaCKeR
|
13924174c4
|
Fix PopIn and PopOut resetting cursor scale
|
2019-10-12 10:04:14 +02:00 |
|
Dean Herbert
|
00d4d976b7
|
Move editor selections relative to hitobject start positions (#6431)
Move editor selections relative to hitobject start positions
|
2019-10-11 19:35:11 +09:00 |
|
smoogipoo
|
45835f97a1
|
Split out grids into separate files
|
2019-10-11 18:41:17 +09:00 |
|
smoogipoo
|
2e2768870f
|
Merge remote-tracking branch 'origin/master' into editor-selection-movement-params
|
2019-10-10 16:38:41 +09:00 |
|
Dean Herbert
|
51bf600ea7
|
Use empty hitwindows instead of null
|
2019-10-09 19:08:31 +09:00 |
|
HoLLy-HaCKeR
|
1c22fb485f
|
Scale cursortrail along with cursor
|
2019-10-08 19:40:46 +02:00 |
|
HoLLy-HaCKeR
|
b6047e4613
|
Move OsuCursor resize logic to OsuCursorContainer
|
2019-10-08 19:39:54 +02:00 |
|
smoogipoo
|
8b661e624d
|
Remove drag from class/method namings + refactor
|
2019-10-08 19:08:31 +09:00 |
|
smoogipoo
|
08d043f447
|
Move selection relative to the hitobject start positions
|
2019-10-08 18:57:03 +09:00 |
|
Dean Herbert
|
b09d9b7e1f
|
Add todo in slider tail to avoid confusion
|
2019-10-08 17:56:56 +09:00 |
|
smoogipoo
|
a59e07948c
|
Merge remote-tracking branch 'GSculerlor/master' into rework-selection-updates
|
2019-10-07 18:50:07 +09:00 |
|
smoogipoo
|
e265beb289
|
Fix merge error
|
2019-10-07 18:49:59 +09:00 |
|
Dean Herbert
|
0ebc5d0ffb
|
Fix cursor trail appearing regardless of the setting in replays (#6288)
Fix cursor trail appearing regardless of the setting in replays
|
2019-10-07 12:32:22 +08:00 |
|
Dean Herbert
|
179cde917b
|
Merge branch 'master' into rework-selection-updates
|
2019-10-06 15:00:56 +08:00 |
|
smoogipoo
|
652acac87f
|
Move placement movement event to BlueprintContainer
|
2019-10-03 16:14:42 +09:00 |
|
smoogipoo
|
c5540048ab
|
Fix tail circle not moving with slider position changes
|
2019-10-01 19:39:06 +09:00 |
|
smoogipoo
|
90ad1c5166
|
Add more tests for slider selection blueprint
|
2019-10-01 19:33:27 +09:00 |
|
smoogipoo
|
ba5c9547e1
|
Add more tests for hitcircle selection blueprint
|
2019-10-01 19:33:15 +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 |
|
iiSaLMaN
|
67bed57cbd
|
Bind value changed event of cursor trail appearence outside BDL
https://github.com/ppy/osu/pull/6270#discussion_r328899728
|
2019-09-27 08:46:49 +03:00 |
|
smoogipoo
|
45f2bcc440
|
Fix combo bindings not being bound to nested hitobjects
|
2019-09-26 17:39:19 +09:00 |
|
smoogipoo
|
3155a90501
|
Use bindables for displayed circle piece numbers
|
2019-09-26 16:58:20 +09:00 |
|
smoogipoo
|
bbf0544a8d
|
Add bindables for IHasComboInformation properties
|
2019-09-26 16:55:08 +09:00 |
|
Salman Ahmed
|
0b2a025cb9
|
Merge branch 'master' into decrease-disc-rotation-on-rewind
|
2019-09-26 04:52:11 +03:00 |
|
smoogipoo
|
74b2e99247
|
Fix invalid cursor trail parts being drawn
|
2019-09-25 16:25:15 +09:00 |
|
Dan Balasescu
|
13f922211f
|
Merge branch 'master' into decrease-disc-rotation-on-rewind
|
2019-09-24 12:58:27 +09:00 |
|
iiSaLMaN
|
57310c86c7
|
Remove unnecessary fields
|
2019-09-20 15:09:51 +03:00 |
|
iiSaLMaN
|
093ed8421e
|
Remove "allow slider ball tinting" ruleset setting
|
2019-09-20 15:08:00 +03:00 |
|
iiSaLMaN
|
1b45014ff6
|
Use logical-OR
|
2019-09-20 00:25:16 +03:00 |
|
iiSaLMaN
|
f6291170b1
|
Implement tinting slider ball with combo colour
|
2019-09-20 00:11:37 +03:00 |
|
iiSaLMaN
|
8fcfd82316
|
Add AllowSliderBallTint to skin configuration
|
2019-09-20 00:10:55 +03:00 |
|
iiSaLMaN
|
033ed2e1f5
|
Add setting to always tint slider ball
|
2019-09-20 00:10:28 +03:00 |
|
Dean Herbert
|
0640b2eb35
|
Fix judgement sizes not matching legacy skins (#6145)
Fix judgement sizes not matching legacy skins
|
2019-09-19 18:49:35 +09:00 |
|
Dean Herbert
|
3abcd898a6
|
Add hit lighting (#6144)
Add hit lighting
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
|
2019-09-19 18:49:22 +09:00 |
|
Dan Balasescu
|
027d6194f2
|
Merge branch 'master' into add-hit-lighting
|
2019-09-19 18:07:29 +09:00 |
|
smoogipoo
|
db24cfbead
|
Merge remote-tracking branch 'origin/master' into auto-restart-mod-perfect
# Conflicts:
# osu.Game/Screens/Play/Player.cs
|
2019-09-19 17:57:04 +09:00 |
|
Dean Herbert
|
2cd7c769e1
|
Merge remote-tracking branch 'upstream/master' into fix-judgement-size
|
2019-09-19 16:32:37 +09:00 |
|