Dan Balasescu
46a57921e2
Merge branch 'master' into osu-fade-slider-body-on-hit
2020-12-02 11:03:04 +09:00
smoogipoo
2bb7484608
Merge branch 'immutable-hit-samples' into hit-sample-pooling
2020-12-01 16:05:28 +09:00
smoogipoo
5760e1c1fc
Make HitSampleInfo immutable
2020-12-01 15:37:51 +09:00
Dean Herbert
dd05c56a08
Fix sliders playing hit animations when completely missed
2020-12-01 15:34:29 +09:00
Dean Herbert
f8ef822e73
Add short fade to better hide transition on default skin
2020-12-01 15:21:32 +09:00
Dean Herbert
d0852d7f4a
Hide slider body immediately on successful hit when snaking is enabled
2020-12-01 14:56:41 +09:00
Dean Herbert
8d101efb24
Remove unused proxy layer
2020-12-01 14:56:14 +09:00
Dean Herbert
b256c54619
Scale slider control point display in line with circle size
2020-12-01 14:17:36 +09:00
Dean Herbert
c8c1848bb8
Fix slider control point dragging not correctly accounting for drag deadzone
2020-12-01 13:46:30 +09:00
Bartłomiej Dach
5fbe1823a0
Merge branch 'master' into editor-beat-snap-always
2020-11-30 18:39:22 +01:00
Dean Herbert
51741c4791
Merge branch 'master' into hit-sample-pooling
2020-11-30 22:25:28 +09:00
smoogipoo
f589da4317
Fix compilation error
2020-11-30 19:24:38 +09:00
Dean Herbert
c17d67bc7d
Merge branch 'master' into editor-beat-snap-always
2020-11-30 18:34:38 +09:00
smoogipoo
4bbeb9ebd4
Merge branch 'master' into hit-sample-pooling
2020-11-30 18:31:58 +09:00
smoogipoo
fdef6e479c
Remove 1000ms offset and adjust comment
2020-11-30 18:28:04 +09:00
smoogipoo
8f48389f89
Merge branch 'master' into improve-dho-time-offsets
2020-11-30 18:01:48 +09:00
Dean Herbert
5bc76cac58
Remove unused using statement
2020-11-27 17:01:07 +09:00
Dean Herbert
1246c8ba5f
Reduce the opacity of the default skin slider ball
...
Previous value was [hitting pure white on some brighter combo
colours](https://github.com/ppy/osu/issues/10910#issuecomment-734354812 ).
2020-11-27 15:22:29 +09:00
Dean Herbert
bcc197f9fe
Merge branch 'master' into improve-dho-time-offsets
2020-11-27 15:03:56 +09:00
ekrctb
fe85b7d482
Remove unused import
2020-11-27 10:18:00 +09:00
ekrctb
57454bbb1c
Remove hitObject argument from OnApply and OnFree
2020-11-27 10:13:05 +09:00
Dean Herbert
b1864670a2
Merge pull request #10961 from smoogipoo/better-dho-rewind
...
Rewind pooled DHOs into better states
2020-11-27 00:42:58 +09:00
Dean Herbert
9811c46e35
Rename application method to better describe what it actually does
2020-11-26 19:16:18 +09:00
Dan Balasescu
aad6cf4ad3
Merge branch 'master' into editor-multiple-object-positional-snap
2020-11-26 17:06:47 +09:00
smoogipoo
0414e5c550
Add MaximumJudgementOffset to DrawableHitObject, use in more places
2020-11-26 01:12:42 +09:00
smoogipoo
c744db1b57
Rewind pooled DHOs into better states
2020-11-26 00:42:25 +09:00
Dean Herbert
c9a41f9dae
Make all objects in selection candidates for spatial snapping
...
Closes #10898 .
2020-11-24 17:35:54 +09:00
Dan Balasescu
87ce8a53ff
Merge branch 'master' into on-drawable-hitobject-added
2020-11-24 16:09:57 +09:00
Dean Herbert
5662e722ed
Merge pull request #10936 from bdach/fix-follow-points-getting-stuck
...
Fix legacy follow point animations not playing after a while
2020-11-23 14:14:00 +09:00
Bartłomiej Dach
827a089810
Merge branch 'master' into change-taiko-ez
2020-11-22 13:29:02 +01:00
Bartłomiej Dach
1c31a4a6b6
Expose animation start time as mutable in interface
2020-11-22 13:11:22 +01:00
ekrctb
c506b438bf
Remove more code and make some methods private
2020-11-22 18:51:16 +09:00
ekrctb
5247ebaf53
Restore accidently removed comment
2020-11-22 18:51:16 +09:00
Bartłomiej Dach
240c1b0aef
Add support for changing animation start time after load
2020-11-21 20:06:30 +01:00
Bartłomiej Dach
e55326e7c7
Merge branch 'master' into fix-slider-selection-nre
2020-11-21 15:08:05 +01:00
ekrctb
295ca38cda
Merge remote-tracking branch 'origin/master' into on-drawable-hitobject-added
2020-11-21 15:25:16 +09:00
ekrctb
4345d8dcb6
Event -> virtual method
2020-11-21 15:20:33 +09:00
ekrctb
82aefa3868
Rework and rename to OnNewDrawableHitObject.
...
The semantics is changed and hopefully more clear.
2020-11-21 00:27:19 +09:00
smoogipoo
9520cf6481
Merge branch 'master' into fix-judgement-ordering
2020-11-20 22:49:33 +09:00
smoogipoo
96abee3fde
Fix silent NRE in slider selection blueprint
2020-11-20 22:43:10 +09:00
Dan Balasescu
de824e47df
Merge branch 'master' into remove-dead-playfield-code
2020-11-20 21:48:24 +09:00
Dan Balasescu
b799fcf65b
Merge pull request #10916 from peppy/fix-editor-context-menus-outside-playfield
...
Fix slider right click context menus not being shown outside the valid playfield area
2020-11-20 21:47:44 +09:00
Dan Balasescu
4213d6bdba
Merge pull request #10890 from peppy/legacy-jugement-match-stable-transforms
...
Adjust judgement animations to match stable
2020-11-20 21:47:21 +09:00
Dan Balasescu
79752bcb19
Merge branch 'master' into legacy-jugement-match-stable-transforms
2020-11-20 20:51:27 +09:00
ekrctb
27f5a99726
Fix more than one proxy is created
2020-11-20 18:42:48 +09:00
ekrctb
cd16a3fa61
Use event instead of using custom pools (osu)
2020-11-20 17:56:47 +09:00
smoogipoo
7bd75eca81
Separate classes
2020-11-20 16:53:08 +09:00
smoogipoo
c1f56cd0ba
Remove aliveness hackery
2020-11-20 16:52:27 +09:00
smoogipoo
85eb98a7ec
Clean up some code reuse
2020-11-20 16:43:07 +09:00
Dean Herbert
7fe0923fcf
Show main judgement content above hitobjects
2020-11-20 16:25:48 +09:00
smoogipoo
2418f17b0c
Fix lifetime not being set correctly in some cases
2020-11-20 16:19:02 +09:00
Dean Herbert
0e9999ecb1
Merge branch 'remove-dead-playfield-code' into fix-judgement-ordering
2020-11-20 16:12:48 +09:00
smoogipoo
2ed2ddfe8a
Rename methods
2020-11-20 15:39:29 +09:00
smoogipoo
33eea64cfc
Fix follow points not updating on positional changes
2020-11-20 15:31:04 +09:00
Dean Herbert
185653b1d8
Remove depth specifications
2020-11-20 15:11:24 +09:00
Dean Herbert
45b1fcf26f
Remove unnecessary using statement
2020-11-20 15:01:37 +09:00
Dean Herbert
af67b4a346
Remove no longer necessary code from OsuPlayfield
2020-11-20 14:57:08 +09:00
smoogipoo
2fc53a278d
Add back reorder support
2020-11-20 14:10:28 +09:00
smoogipoo
17ff7fe163
Fix failing test due to early lifetime end
2020-11-20 13:55:27 +09:00
smoogipoo
a3145ed96d
Fix test compile errors
2020-11-20 13:54:41 +09:00
Dean Herbert
b547abafb2
Fix slider right click context menus not being shown outside the valid playfield area
...
Closes #10816 .
2020-11-20 13:46:23 +09:00
smoogipoo
d467a00eea
Add initial followpoint pooling implementation
2020-11-20 00:11:31 +09:00
smoogipoo
688a04c2ff
Make slider/spinner use pooled samples
2020-11-19 20:40:30 +09:00
Dean Herbert
7f3c8ad744
Merge pull request #10872 from smoogipoo/fix-missing-triangles
2020-11-19 14:11:08 +09:00
Dean Herbert
3024ae6d86
Add better test coverage of hit lighting (and ensure reset after animation reapplication)
2020-11-19 14:10:07 +09:00
Bartłomiej Dach
24d7fa03d8
Merge branch 'master' into legacy-jugement-match-stable-transforms
2020-11-18 20:33:58 +01:00
Bartłomiej Dach
5156de3a10
Merge branch 'master' into fix-judgement-transform-logic
2020-11-18 19:20:11 +01:00
Dean Herbert
d017e725fb
Add comment for future todo task
2020-11-18 19:03:34 +09:00
Dean Herbert
9d3de5bca0
Fix hit lighting dictating lifetime even when not present in skin
2020-11-18 19:03:34 +09:00
Dean Herbert
72a15ef2dc
Handle DrawableJudgement lifetime more flexibly
2020-11-18 19:03:34 +09:00
Dean Herbert
94886a09b2
Remove fades from DrawableJudgement itself
2020-11-18 19:03:34 +09:00
Dean Herbert
37b9550e6e
Merge pull request #10876 from nbvdkamp/slider-control-point-connection-fix
...
Fix slider control point connections not being updated
2020-11-18 18:54:54 +09:00
kamp
2d66423fbd
Simplify inequality
2020-11-17 23:04:38 +01:00
kamp
c8fb49d540
Apply suggestions and remove redundant updateConnectingPath call
2020-11-17 22:23:46 +01:00
smoogipoo
ce4baf328d
Move into OnApply() to resolve one-frame issues
2020-11-17 23:35:36 +09:00
smoogipoo
04805b78c3
Tighten osu! ruleset lifetime expiry for past hitobjects
2020-11-17 23:20:19 +09:00
Dean Herbert
8247e6ce91
Move result type to ctor
2020-11-17 15:43:54 +09:00
Dean Herbert
f465dd5a5e
Move all extended animation logic out of DrawableJudgement
2020-11-17 14:59:34 +09:00
Dean Herbert
82c3925a37
Remove unused DrawableOsuJudgement constructors
2020-11-17 14:13:51 +09:00
Dean Herbert
9dfa4249e0
Make Apply non-virtual
2020-11-17 14:05:13 +09:00
smoogipoo
c101f32db8
Reset osu! triangle pieces on hitobject application
2020-11-17 13:06:52 +09:00
kamp
c6618f08aa
Fix slider control point connections not being updated
2020-11-16 21:26:08 +01:00
Bartłomiej Dach
8da40ce2dc
Reduce duplication by extracting ModEasyWithExtraLives
2020-11-16 19:54:00 +01:00
Bartłomiej Dach
128adce017
Merge branch 'master' into change-taiko-ez
2020-11-16 19:37:47 +01:00
smoogipoo
84b42f207d
Fix triangles disappearing after a while
2020-11-16 23:14:20 +09:00
smoogipoo
4cf6aca873
Fix slider ball tint not working
2020-11-16 22:40:25 +09:00
PercyDan54
99ee5e3ad7
Correct inheritance
2020-11-16 18:28:50 +08:00
PercyDan54
d7acfd5413
Remove retires from ModEasy
2020-11-16 18:15:15 +08:00
Dan Balasescu
09298139e1
Merge pull request #10844 from bdach/spinner-rotation-tracker-state
...
Fix rotation tracker state not being reset on drawable spinner re-use
2020-11-16 17:10:40 +09:00
Dean Herbert
6706840b54
Merge pull request #10853 from bdach/add-to-legacy-conversion-tests
2020-11-16 15:22:04 +09:00
Bartłomiej Dach
a17990f2ee
Fix osu!-specific missing cases
2020-11-15 15:40:31 +01:00
kamp
268bbcf77d
Clamp selection movement instead of refusing to move on borders
2020-11-15 14:22:46 +01:00
Bartłomiej Dach
532680bb36
Manually reset rest of rotation tracker state on object application
2020-11-14 23:23:11 +01:00
Bartłomiej Dach
727a886fb3
Move spinner completion info into judgement
2020-11-14 23:08:47 +01:00
Bartłomiej Dach
af392e3995
Move rate adjusted spinner rotation into judgement result
2020-11-14 21:10:12 +01:00
Dean Herbert
deea75b2e9
Fix typo in comment
2020-11-14 18:05:51 +09:00
Dean Herbert
7ac4d2c4be
Move "drawable" to first prefix
2020-11-14 18:05:30 +09:00
Dean Herbert
90f37ff4ab
Rejig namespaces
2020-11-14 18:04:59 +09:00
Dean Herbert
354e748e45
Merge branch 'master' into osu-hitobject-pooling-playfield
2020-11-14 15:44:00 +09:00
Bartłomiej Dach
3985fb1fa7
Merge branch 'master' into allow-reversing-spinners
2020-11-13 19:48:40 +01:00
smoogipoo
5b60f32c7f
Move implementation into OsuPlayfield
2020-11-14 01:03:23 +09:00
smoogipoo
1e05fd48e2
Fix hidden mod crash
2020-11-13 23:08:27 +09:00
kamp
742a140462
Merge branch 'master' into allow-reversing-spinners
2020-11-13 11:08:56 +01:00
smoogipoo
f7f70d41df
Add osu! editor pooling support
2020-11-13 17:28:26 +09:00
smoogipoo
3c91626132
Merge branch 'pooling-editor-support' into osu-editor-pooling
2020-11-13 17:27:00 +09:00
smoogipoo
942ecde0e1
Merge branch 'master' into pooling-editor-support
2020-11-13 17:23:35 +09:00
smoogipoo
4ef2e9548c
Pass HitObjectComposer to BlueprintContainer via ctor
2020-11-13 16:59:37 +09:00
smoogipoo
beb6bbd2a1
Implement now abstract method
2020-11-13 14:58:32 +09:00
smoogipoo
7085b25898
Merge branch 'hitobject-pooling-base' into osu-hitobject-pooling
2020-11-13 14:57:59 +09:00
Dean Herbert
38105ed6a2
Merge branch 'master' into hitobject-pooling-base
2020-11-13 11:27:32 +09:00
Dean Herbert
030df8234a
Merge pull request #10805 from bdach/fix-osu-hd-mod-part-2
...
Fix slider ends not fading out after a rewind with hidden mod
2020-11-13 11:27:15 +09:00
kamp
66544544d3
Merge branch 'master' into allow-reversing-spinners
2020-11-13 00:40:49 +01:00
kamp
45ce6cc82d
Allow spinners to be reversed
2020-11-13 00:36:47 +01:00
kamp
1439c0f392
Prevent SelectionBox handles from appearing when a stack of circles is selected
2020-11-12 23:19:29 +01:00
Dan Balasescu
2840fd0f8f
Merge branch 'master' into hitobject-pooling-base
2020-11-12 23:17:36 +09:00
smoogipoo
3f0a127196
Fix slider/spinner samples not being disposed
2020-11-12 18:51:58 +09:00
smoogipoo
7548db7ecc
Fix hitobjects sometimes not fading in completely with HD mod
2020-11-12 18:29:22 +09:00
Bartłomiej Dach
0ae6f82291
Fix incorrect fade of slider ends after a rewind
2020-11-12 09:33:39 +01:00
smoogipoo
3f78d81386
Add nested osu! hitobject pooling
2020-11-12 15:59:48 +09:00
smoogipoo
1ea526b5ef
Adjust pooling implementation with branch changes
2020-11-12 15:39:02 +09:00
smoogipoo
bf72961959
Add top-level osu! hitobject pooling
2020-11-12 15:39:02 +09:00
smoogipoo
606cfacedf
Fix state update exception in a better way
2020-11-11 19:01:12 +09:00
smoogipoo
5d55af5818
Fix hitobjects sometimes not fading in completely with HD mod
2020-11-11 16:35:48 +09:00
Dean Herbert
a82291f31f
Merge pull request #10776 from smoogipoo/fix-possible-nullref
...
Fix possible nullref with non-attached hitobjects
2020-11-11 11:14:57 +09:00
smoogipoo
81844878b0
Fix possible nullref with non-attached hitobjects
2020-11-11 00:29:34 +09:00
smoogipoo
0bab5605d1
Merge branch 'master' into dho-apply
2020-11-10 01:30:45 +09:00
kamp
42c543472d
Remove unnecessary null coalesce
2020-11-07 01:56:41 +01:00
kamp
b47a2a03d5
Fix nullref when quickdeleting slider that hasn't been selected yet
2020-11-07 01:53:14 +01:00
Dean Herbert
d93cf08570
Merge branch 'master' into dho-apply
2020-11-07 01:18:46 +09:00
smoogipoo
b1e039bcec
Prevent overrides from messing with application/freeing
2020-11-07 00:40:26 +09:00
smoogipoo
3a4bd73823
Fix DHOs being freed when not expected
2020-11-07 00:25:26 +09:00
smoogipoo
e190afbfed
Remove initial value changed invocations
2020-11-07 00:00:25 +09:00
smoogipoo
33b629a87a
Make top-level osu! objects use new methods
2020-11-06 23:09:23 +09:00
Dan Balasescu
f230250faf
Merge branch 'master' into editor-slider-control-point-quick-delete
2020-11-06 21:47:37 +09:00
Dan Balasescu
cf9acca78a
Merge pull request #10676 from peppy/fix-hitcircle-glow-on-skin-change
...
Fix skin changes resulting in incorrectly applied transforms in MainCirclePiece
2020-11-06 21:09:22 +09:00
Dean Herbert
e0ef777e87
Merge branch 'master' into fix-hitcircle-glow-on-skin-change
2020-11-06 16:47:56 +09:00
Dan Balasescu
5d7fa42d90
Merge branch 'master' into add-spinner-clear
2020-11-06 16:14:15 +09:00
Dan Balasescu
44c6457c85
Merge branch 'master' into add-spinner-spin
2020-11-06 15:40:40 +09:00
Dan Balasescu
41dc3a7abd
Merge branch 'master' into add-spinner-glow
2020-11-06 14:37:54 +09:00
Dan Balasescu
71a1165209
Merge branch 'master' into drawable-hit-object-hit-state-fix
2020-11-06 13:19:25 +09:00
Dean Herbert
d7a912a0d2
Match stable's transform 1:1
2020-11-05 19:44:34 +09:00
Dean Herbert
71253cb5e9
Add support for spinner "clear" text in legacy skins
2020-11-05 19:35:32 +09:00
Dean Herbert
5e387e92cd
Add positional offset to avoid the SPM counter
2020-11-05 19:16:47 +09:00
Dean Herbert
901102918e
Centralise scale and apply to SPIN text
2020-11-05 19:05:59 +09:00
Dean Herbert
3ec813da03
Add "spin" sprite
2020-11-05 18:48:47 +09:00
Dean Herbert
2bbdbfda5c
Merge pull request #10696 from smoogipoo/visibility-adjustment-mod
2020-11-05 18:18:57 +09:00
Dean Herbert
5ec6011340
Apply new style spinner scale to only local sprites
2020-11-05 18:14:49 +09:00
Dean Herbert
11c18952e3
Allow children to be added in base class
2020-11-05 18:12:06 +09:00
Dean Herbert
64e3325b41
Abstract out common part of legacy spinner implementations
...
Some elements going forward will be shared, so it makes sense to have a
common base class to add these shared elements.
2020-11-05 18:00:27 +09:00
Dean Herbert
82d8c1bbea
Add support for spinner glow
2020-11-05 17:27:41 +09:00
Dean Herbert
0cadb31947
Merge branch 'master' into drawable-hit-object-hit-state-fix
2020-11-05 17:07:52 +09:00
Dean Herbert
4a4fa96fef
Merge pull request #10692 from smoogipoo/followpointrenderer-hitobject
2020-11-05 16:39:05 +09:00
Dean Herbert
54775ccacf
Merge pull request #10690 from smoogipoo/osu-remove-hitobject-references
2020-11-05 16:22:13 +09:00
smoogipoo
d1fa391d25
Make OsuModHidden apply fadein adjustment on custom state update
2020-11-05 16:12:55 +09:00
smoogipoo
f513c95ab2
Use class with transform and wiggle mods
2020-11-05 16:04:42 +09:00
smoogipoo
cc518feca7
Make methods abstract
2020-11-05 16:03:10 +09:00
smoogipoo
77a618dd71
Use class with other osu! mods
2020-11-05 15:52:06 +09:00
Dean Herbert
a43166e8a9
Merge branch 'master' into followpointrenderer-hitobject
2020-11-05 15:42:09 +09:00
Dean Herbert
54f927ee11
Move casts to DrawableHitObject instead
2020-11-05 15:41:55 +09:00
smoogipoo
628b8be15d
Implement ModWithVisibilityAdjustment
2020-11-05 15:40:25 +09:00
Dean Herbert
c26fd4dc3d
Merge pull request #10691 from smoogipoo/osu-lighting-colour-reuse
...
Remove AccentColour binding from judgement lighting
2020-11-05 15:37:28 +09:00
Dean Herbert
e2d028908a
Fix one more case of local variable preference
2020-11-05 15:25:20 +09:00
Dean Herbert
4457e363d3
Bring back local variables to reduce two-level-deep variable access
2020-11-05 15:22:40 +09:00
Dean Herbert
3f24fabb57
Add change handler support for contorl point deletion
2020-11-05 15:05:43 +09:00
smoogipoo
9c1c9945af
Make FollowPointRenderer use hitobject models
2020-11-05 15:01:45 +09:00
Dean Herbert
242ec1ca82
Don't override PathControlPointVisualiser's positional handling
...
It turns out it was relying on this to deselect control points on
clicking away from them.
2020-11-05 14:58:30 +09:00
smoogipoo
9ac822beed
Remove AccentColour binding from judgement lighting
2020-11-05 14:49:15 +09:00
smoogipoo
400fcedf0f
Remove stored hitobject references from skinnable components
2020-11-05 14:40:48 +09:00
Dean Herbert
eed9894d3a
Remove usage of case-when (caught me off-gaurd)
2020-11-05 13:58:41 +09:00
smoogipoo
9a7fcadabc
Use BDL for top-level osu! DHOs
2020-11-05 13:51:46 +09:00
Dean Herbert
f9fc58c45c
Apply same fix to LegacyMainCirclePiece
2020-11-04 17:30:23 +09:00
Dean Herbert
65fb8628e0
Use HitStateUpdateTime
2020-11-04 17:30:11 +09:00
Dean Herbert
e5a5c3713d
Merge branch 'drawable-hit-object-hit-state-fix' into fix-hitcircle-glow-on-skin-change
2020-11-04 17:15:20 +09:00
Dean Herbert
a3dc1d5730
Update existing implementations
2020-11-04 17:14:23 +09:00
Dean Herbert
9f333ac58a
Add the ability to delete slider control points using shift+right click
...
Closes https://github.com/ppy/osu/issues/10672 .
In two minds about how this should be implemented but went in this
direction initially. The other way would be to add local handling of
Shift-Right Click inside PathControlPointPiece (which is already doing
mouse handling itself).
2020-11-03 20:46:33 +09:00
Dean Herbert
b069372b29
Fix skin changes resulting in incorrectly applied transforms in MainCirclePiece
2020-11-03 17:49:48 +09:00
Bartłomiej Dach
164370bc7d
Resolve more CA1805 inspections
2020-11-01 20:51:23 +01:00
Dean Herbert
606a4304a8
Remove unused usings
2020-10-27 14:33:16 +09:00
Dean Herbert
9cfb81589e
Use bindable flow instead
2020-10-27 14:10:12 +09:00
Bartłomiej Dach
5ef1b5dcb5
Remove unused locals
2020-10-25 23:55:22 +01:00
Bartłomiej Dach
0a23e994e2
Hide sliderend & repeat circles in traceable mod
2020-10-25 23:30:26 +01:00
Dean Herbert
267b399f9f
Add some simple border styles
2020-10-20 13:59:03 +09:00
Bartłomiej Dach
7c388f1132
Move editor playfield border locally to osu! composer
2020-10-19 21:20:13 +02:00
Bartłomiej Dach
bca0539735
Move setting to osu! ruleset subsection
2020-10-19 21:05:21 +02:00
Bartłomiej Dach
4267d23d59
Move border to more appropriate namespace
2020-10-19 20:56:34 +02:00
Bartłomiej Dach
4af3fd1ed6
Allow toggling border on & off during gameplay
2020-10-19 20:41:45 +02:00
Bartłomiej Dach
053c7a69a6
Fix code style issues & compilation failures
2020-10-19 20:22:48 +02:00
Dean Herbert
22bde43106
Merge branch 'master' into visible-playfield-boundary
2020-10-19 18:05:28 +09:00
Bartłomiej Dach
f41879ee7c
Show current hit circle placement in timeline
2020-10-10 17:54:37 +02:00
Bartłomiej Dach
146b15371d
Merge branch 'master' into fix-slider-sample-parsing
2020-10-10 14:02:33 +02:00
Dean Herbert
681e88af40
Merge branch 'master' into editor-fix-button-states-after-paste
2020-10-09 20:51:09 +09:00
smoogipoo
696e3d53af
Fix slider samples being overwritten by the last node
2020-10-09 20:50:09 +09:00
Dan Balasescu
ecfb7e94c5
Merge branch 'master' into fix-editor-batch-handling
2020-10-09 20:06:06 +09:00
Dan Balasescu
93f5ea57a5
Merge pull request #10427 from peppy/fix-hidden-first-object
...
Fix first hitobject in osu! hidden mod not getting correct fade applied
2020-10-09 19:23:47 +09:00
Dan Balasescu
62690e4873
Merge pull request #10432 from peppy/editor-reverse-pattern
...
Add "reverse pattern" support to editor selection handler
2020-10-09 19:19:24 +09:00
Dean Herbert
3838f405dd
Fix missed usages
2020-10-09 18:50:05 +09:00
Dean Herbert
febfe9cdd0
Don't fade the approach circle on increased visibility
2020-10-09 18:43:16 +09:00
Dan Balasescu
6572ce5f36
Merge pull request #10441 from peppy/editor-selection-blueprint-performance
...
Improve performance of slider blueprints
2020-10-09 18:01:25 +09:00
Dean Herbert
a0af2eb6c8
Private protect setters
2020-10-09 16:54:43 +09:00
Dean Herbert
6b9e94ae93
Avoid retaining slider selection blueprints FBO backing textures after deselection
2020-10-09 14:05:00 +09:00
Dean Herbert
34d1439f8e
Only update slider selection blueprints paths when visible
2020-10-09 14:04:26 +09:00
Dean Herbert
07558b5bc0
Merge branch 'master' into ruleset-result-types
2020-10-09 13:17:05 +09:00
Dean Herbert
2a790c76d5
Add reverse implementation for osu!
2020-10-09 06:32:33 +09:00
Dean Herbert
2d0275ba95
Fix first hitobject in osu! hidden mod not getting correct fade applied
2020-10-09 03:07:01 +09:00
Dean Herbert
afed832b19
Tidy up EditorBeatmap slightly
2020-10-08 18:06:49 +09:00
Dean Herbert
f1a3b6d0ba
Merge branch 'master' into perf-calculator-remove-working-beatmap
2020-10-07 17:43:17 +09:00
Dean Herbert
6020ec9ca3
Add valid result types for all rulesets
2020-10-07 15:43:52 +09:00
Dan Balasescu
c803be2dd2
Merge pull request #10385 from peppy/fix-slider-end-circle-fallback-case
...
Fix incorrect sliderendcircle fallback logic
2020-10-06 20:10:51 +09:00
Dan Balasescu
e1b5c83ae6
Merge pull request #10386 from peppy/fix-stacked-circles-visibility
...
Make stacked hitcircles more visible when using default skin
2020-10-06 19:48:07 +09:00
Dean Herbert
9d7880afda
Make SettingsItem conform to IHasCurrentValue
2020-10-06 17:18:54 +09:00
Dean Herbert
048507478e
Join declaration and specification
2020-10-06 14:12:46 +09:00
Dean Herbert
ed982e8dd1
Make stacked hitcircles more visible when using default skin
2020-10-06 14:09:31 +09:00
Dean Herbert
767a2a10bd
Fix incorrect sliderendcircle fallback logic
...
Correctly handle the case where a skin has "sliderendcircle.png" but not
"sliderendcircleoverlay.png".
2020-10-06 13:56:42 +09:00
Dan Balasescu
6d50a1ed7d
Merge branch 'master' into osu-selection-flip-rotate-buttons
2020-10-05 19:17:33 +09:00
Dan Balasescu
08f7b18dbe
Merge pull request #10294 from peppy/osu-selection-scaling
...
Add selection scale and rotate support
2020-10-05 19:17:19 +09:00
Dan Balasescu
cbf697336f
Merge pull request #10323 from peppy/skin-slider-end-circle-support
...
Add legacy skin "sliderendcircle" support
2020-10-05 19:02:38 +09:00
Dan Balasescu
b20dc793cc
Merge pull request #10321 from LittleEndu/trail-density
...
Try to match stable's cursor trail density
2020-10-05 19:02:28 +09:00
Dan Balasescu
2df5ea8ba8
Merge branch 'master' into osu-selection-scaling
2020-10-05 18:47:17 +09:00
Dean Herbert
f0b5ba9534
Merge branch 'master' into skin-slider-end-circle-support
2020-10-05 17:45:51 +09:00
Dan Balasescu
692ca87bec
Merge branch 'master' into fix-spinner-rewind-crash
2020-10-05 15:32:52 +09:00
Dean Herbert
5dea37792c
Merge branch 'master' into health-adjustments
2020-10-04 21:38:40 +09:00
Bartłomiej Dach
a366591d6d
Merge branch 'master' into osu-selection-scaling
2020-10-04 13:28:59 +02:00
Bartłomiej Dach
26eff0120d
Apply same fix for miss-triggering case
...
See 5888ecd
2020-10-03 21:11:34 +02:00
Dean Herbert
5888ecdeb1
Fix spinner crashing on rewind
2020-10-04 01:08:24 +09:00
Lucas A
27cc6c5046
Rename HitCirclesCount -> HitCircleCount.
2020-10-03 16:52:33 +02:00
Lucas A
d7747ebb2d
Remove unused WorkingBeatmap argument.
2020-10-03 16:51:22 +02:00
Bartłomiej Dach
db31280671
Award health for completed slider tails
2020-10-03 12:16:22 +02:00
Bartłomiej Dach
1f0620ffd4
Replace assignment references to HitResult.Miss with Judgement.MinResult
2020-10-02 23:31:24 +02:00
Bartłomiej Dach
2b1ef16f89
Replace comparison references to HitResult.Miss with IsHit
2020-10-02 23:31:24 +02:00
Lucas A
abd395a030
Remove unecessary using references.
2020-10-02 19:41:24 +02:00
Lucas A
cb2f695fdd
Calculate hit circle count in OsuPerformanceCalculator.
2020-10-02 19:34:41 +02:00
Lucas A
0163688a17
Remove IBeatmap from PerformanceCalculator.
2020-10-02 19:24:30 +02:00
Endrik Tombak
676f58c3bf
Merge branch 'master' of https://github.com/ppy/osu into trail-density
2020-10-02 19:36:40 +03:00
Endrik Tombak
8cd13729ee
Actually multiply by the multiplier
2020-10-02 19:34:49 +03:00
Endrik Tombak
16f331cf6d
Move implementation to LegacyCursorTrail
2020-10-02 19:34:06 +03:00
Dean Herbert
b1e7a5113e
Merge pull request #10328 from smoogipoo/fix-spinner-transforms
...
Fix spinners not transforming correctly
2020-10-02 23:51:09 +09:00
Dean Herbert
a3ecc6c5a4
Remove redundant array type specification
2020-10-02 19:56:24 +09:00
Dean Herbert
5a6c45e2ff
Fix hidden mod support for sliderendcircle
2020-10-02 18:41:28 +09:00
smoogipoo
fe818a020a
Fix spinners not transforming correctly
2020-10-02 16:17:57 +09:00
Dean Herbert
dde7f706aa
Avoid rapid triangle repositioning during editor slider placement
2020-10-02 15:51:14 +09:00
Dean Herbert
ad4cac13ac
Add preempt adjustment and fade in first end circle with slider to match stable
2020-10-02 15:21:52 +09:00
Dean Herbert
2975ea9210
Adjust repeat/tail fade in to match stable closer
2020-10-02 14:50:03 +09:00
Dean Herbert
2427ae43da
Share fade in logic with repeats
2020-10-02 14:50:03 +09:00
Dean Herbert
5d2a8ec764
Add final sliderendcircle display support
2020-10-02 14:50:03 +09:00
Dean Herbert
fc7f3173e1
Add the ability to use LegacyMainCirclePiece with no combo number displayed
2020-10-02 14:50:03 +09:00
Dean Herbert
fce3eacd7d
Move tail circle to display beneath ticks etc.
2020-10-02 14:50:03 +09:00
Endrik Tombak
fa1903cd03
Get bound copy instead
2020-10-01 23:41:24 +03:00
Endrik Tombak
abf1afd3f1
Do not decrease density
2020-10-01 23:27:57 +03:00
Endrik Tombak
9e52f9c858
Consider cursor size in trail interval
2020-10-01 23:23:28 +03:00
Dean Herbert
3069428efe
Merge pull request #10316 from smoogipoo/fix-spinner-flicker
...
Fix default spinner flashing yellow glow before completion
2020-10-01 22:29:48 +09:00
Dean Herbert
94996f2cc0
Merge branch 'master' into osu-selection-scaling
2020-10-01 21:09:52 +09:00
smoogipoo
6d3f4c8699
Fix a few more similar cases
2020-10-01 20:38:47 +09:00
Dan Balasescu
df07ca445f
Merge branch 'master' into legacy-SpinnerNoBlink
2020-10-01 20:34:23 +09:00
smoogipoo
ba76089219
Fix spinner flashing yellow glow before completion
2020-10-01 20:24:32 +09:00
smoogipoo
3e6af7ce43
Refactor for readability
2020-10-01 20:09:09 +09:00
Max Hübner
7e5ecd84bc
Add braces to clear up operator precedence
2020-10-01 12:41:44 +02:00
Dean Herbert
b6dc8bb2d3
Fix remaining manual degree-to-radian conversions
2020-10-01 18:10:05 +09:00
Dan Balasescu
3a81602d0c
Merge pull request #10286 from peppy/fix-hitobject-sample-stuck-on-future-seek
...
Fix HitObject samples getting stuck in a playing state on seeking far into the future
2020-10-01 18:08:17 +09:00
Dean Herbert
538973e394
Use float methods for math operations
2020-10-01 17:06:05 +09:00
Dean Herbert
b7ac779760
Merge branch 'master' into fix-hitobject-sample-stuck-on-future-seek
2020-10-01 16:46:14 +09:00
Dean Herbert
983b693858
Add flip logic to OsuSelectionHandler
2020-10-01 16:24:50 +09:00
Dean Herbert
02f14ab4b0
Rename operation start/end to be more encompassing
2020-10-01 16:24:09 +09:00
smoogipoo
7890319802
Merge branch 'master' into adjust-hit-result-types
2020-10-01 16:19:07 +09:00
smoogipoo
cb6b35116a
Merge branch 'master' into scoring-standardisation
2020-10-01 12:28:51 +09:00
smoogipoo
3c9ee6abc1
Use local static to determine score per spinner tick
2020-10-01 12:15:34 +09:00
Dean Herbert
4b70fe8585
Merge branch 'fix-storyboard-sample-pausing' into fix-hitobject-sample-stuck-on-future-seek
2020-09-30 22:46:09 +09:00
Dean Herbert
7f579850dd
Merge branch 'master' into fix-editor-silence-on-seek
2020-09-30 17:03:23 +09:00
Dean Herbert
414c40d298
Reverse inheritance order of SkinnableSound's pause logic
2020-09-30 15:45:14 +09:00
Dean Herbert
59ce9fcab9
Merge branch 'master' into fix-editor-silence-on-seek
2020-09-30 15:35:55 +09:00
Dean Herbert
7fad9ce34a
Simplify HandleScale method
2020-09-30 15:20:25 +09:00
Dean Herbert
f1298bed79
Combine scale operations and tidy up scale drag handle construction
2020-09-30 15:08:56 +09:00
Dean Herbert
313b0d149f
Refactor scale and rotation operations to share code better
...
Also adds support for scaling individual sliders.
2020-09-30 14:41:33 +09:00
Dean Herbert
39b55a85df
Move a lot of the implementation to base SelectionHandler
2020-09-30 13:52:57 +09:00
Dean Herbert
99a3801267
Tidy up scale/rotation operation code
2020-09-30 13:02:05 +09:00
Dean Herbert
5ae6b2cf5b
Fix syntax
2020-09-29 20:10:17 +09:00
Dean Herbert
a2e2cca396
Add proper change handler support
2020-09-29 20:08:56 +09:00
Dean Herbert
934db14e03
Add rotation support
2020-09-29 20:08:56 +09:00
Dean Herbert
33b24b6f46
Refactor to be able to get a quad for the current selection
2020-09-29 20:08:56 +09:00
Dean Herbert
0a10e40ce0
Add scaling support to osu! editor
2020-09-29 20:08:56 +09:00
smoogipoo
f439c1afbc
Make osu/taiko/catch use Ok+Great
2020-09-29 17:16:55 +09:00
smoogipoo
cd895c792c
Merge branch 'master' into scoring-standardisation
2020-09-29 17:04:59 +09:00
smoogipoo
bad48d6d44
Merge branch 'master' into scoring-standardisation
2020-09-29 16:33:38 +09:00
smoogipoo
31fae045fa
Update judgement processors with new hit results
2020-09-29 16:33:38 +09:00
smoogipoo
a1394c1830
Fix a few missed judgements
2020-09-29 16:33:38 +09:00
smoogipoo
a77741927c
Use new hit results in osu
2020-09-29 16:33:38 +09:00
Dean Herbert
5d1c377379
Fix HitObject samples getting stuck in a playing state on seeking far into the future
2020-09-29 15:07:55 +09:00
Dean Herbert
d6f3beffb6
Use existing bindable flow instead
2020-09-29 12:50:17 +09:00
Dean Herbert
cc9bf67d42
Merge branch 'master' into fix-spinner-rpm-user-rate-adjust
2020-09-29 12:10:24 +09:00
Dan Balasescu
66e89f56d9
Merge pull request #10280 from peppy/editor-fix-spinner-extending
...
Fix extending spinners in editor causing them to disappear temporarily
2020-09-28 19:41:44 +09:00
Max Hübner
54852991f3
Move SpinnerNoBlink to OsuSkinConfiguration
2020-09-28 12:24:30 +02:00
Max Hübner
40a4654ef9
Invert spinnerNoBlink to spinnerBlink locally
2020-09-28 12:21:43 +02:00
smoogipoo
b6bc829bd5
Guard against nulls (load not run)
2020-09-28 17:46:22 +09:00
Dean Herbert
fd58a24183
Merge branch 'master' into fix-spinner-rpm-user-rate-adjust
2020-09-28 17:45:48 +09:00
Dan Balasescu
1b6ef60f36
Merge branch 'master' into editor-fix-slider-drag-after-snaking
2020-09-28 17:45:04 +09:00
Dean Herbert
e60e47ff66
Unbind events on disposal
2020-09-28 17:41:10 +09:00
Dean Herbert
63b5b8b841
Fix sliders not dragging correctly after snaking has begun
...
Closes #10278 .
2020-09-28 17:33:00 +09:00
Dean Herbert
8692c24dfc
Fix extending spinners in editor causing them to disappear temporarily
2020-09-28 17:20:36 +09:00
Dean Herbert
5237fa7bf2
Remove unused local in case statement
2020-09-28 16:37:54 +09:00
Dean Herbert
467a16bf75
Fix fade out extension logic (and make it generally look better for sliders)
2020-09-28 16:21:20 +09:00
Dean Herbert
6095446f10
Fix autoplay generators failing on empty hitobjects lists
2020-09-28 15:38:54 +09:00
Max Hübner
33d000e532
Add support for SpinnerNoBlink in legacy spinner
2020-09-26 16:25:57 +02:00
Dean Herbert
b2261f03e2
Merge branch 'master' into fix-spinner-rpm-user-rate-adjust
2020-09-25 20:21:35 +09:00
Dean Herbert
346d14d40b
Rename variables to match
2020-09-25 17:45:19 +09:00
Dean Herbert
22511c36c3
Ensure toggles are not instantiated more than once for safety
2020-09-25 17:43:09 +09:00
Dean Herbert
ae68dcd962
Add ternary toggle buttons to editor toolbox selection
2020-09-25 16:38:12 +09:00
Dean Herbert
0f8551e9ea
Merge branch 'editor-ternary-states' into new-combo-toggle
2020-09-25 15:36:33 +09:00
Dean Herbert
bca774a0d4
Allow BlueprintContainer to specify toggles
2020-09-25 14:09:31 +09:00
Dean Herbert
7df8b5bce7
Merge branch 'master' into fix-spinner-rpm-user-rate-adjust
2020-09-25 13:17:03 +09:00
Dean Herbert
d9e8ac6842
Add support for slider end snapping
2020-09-24 16:24:35 +09:00
Dean Herbert
44be0ab762
Add basic osu! object to object snapping
2020-09-24 16:24:35 +09:00
Dean Herbert
ba160aab76
Fix large construction/disposal overhead on beatmaps with hitobjects at same point in time
2020-09-23 15:41:43 +09:00
Dan Balasescu
625c146460
Merge pull request #10199 from peppy/fix-editor-binding-crash
...
Fix bindings not correctly being cleaned up in OsuHitObjectComposer
2020-09-23 12:38:18 +09:00
Dan Balasescu
53788968c8
Merge pull request #10205 from peppy/fix-composer-distance-snap-selection
...
Fix compose mode not showing distance snap grid when entering with a selection
2020-09-23 11:55:42 +09:00
Dean Herbert
b1f7cfbd5b
Reduce children levels in RingPiece
2020-09-22 17:34:21 +09:00
Dean Herbert
8e43266460
Fix compose mode not showing distance snap grid when entering with a selection
2020-09-22 16:02:07 +09:00
Dean Herbert
25bf160d94
Fix missing GameplayClock in some tests
2020-09-21 22:30:14 +09:00
Dean Herbert
3f788da06d
Fix SPM changing incorrectly with playback rate changes
2020-09-21 19:39:54 +09:00
Dean Herbert
842f8bea55
Fix bindings not correctly being cleaned up in OsuHitObjectComposer
2020-09-21 18:15:33 +09:00
Dean Herbert
1e09d8fd1a
Merge branch 'master' into catch-combo-counter
2020-09-21 17:53:00 +09:00
Dean Herbert
141fbbf5bb
Merge pull request #10180 from smoogipoo/beatmap-conversion-cancellation
...
Make beatmap conversion support cancellation tokens
2020-09-17 22:30:46 +09:00
smoogipoo
c7d24203ce
Make beatmap conversion support cancellation tokens
2020-09-17 17:40:05 +09:00
smoogipoo
009e1b4445
Make Spinner use cancellation token
2020-09-17 17:05:24 +09:00
Dan Balasescu
0761aab42f
Merge branch 'master' into catch-combo-counter
2020-09-15 17:20:31 +09:00
Dean Herbert
a8b405791a
Fix non-convert slider and spinner serialization
2020-09-14 17:32:32 +09:00
Dean Herbert
23b51e8f7f
Merge pull request #10106 from smoogipoo/score-recalc
2020-09-10 19:05:42 +09:00
Dean Herbert
ef44c7d063
Merge branch 'master' into score-recalc
2020-09-10 18:30:41 +09:00
Dean Herbert
df1537f2a0
Update framework
2020-09-10 18:10:39 +09:00
Dan Balasescu
6f6adb61d7
Merge pull request #10099 from peppy/add-editor-tool-icons
...
Add icons for editor toolbox tools
2020-09-09 22:22:58 +09:00
Dean Herbert
fb2aced3ac
Add toggle for distance snap
2020-09-09 19:15:35 +09:00
Dean Herbert
c9f5005efd
Add icons for editor toolbox tools
2020-09-09 18:40:01 +09:00
smoogipoo
117c7ec6b2
Merge branch 'master' into score-recalc
2020-09-09 14:38:36 +09:00
Dean Herbert
4680728b9c
Merge branch 'master' into update-dcc-exclusions
2020-09-07 18:01:44 +09:00
Dan Balasescu
025ead195c
Merge branch 'master' into fix-sliderborder-more-thicker
2020-09-07 15:40:34 +09:00
Yao Chung Hu
96f39dd350
Merge remote-tracking branch 'upstream/master' into visible-playfield-boundary
2020-09-05 01:50:13 -05:00
smoogipoo
1143d5d992
Update class exclusion for dynamic compilation
2020-09-04 20:41:08 +09:00
Salman Ahmed
569a56eccb
Revert "Move adjustment to LegacySkinConfiguration as a default value"
...
This reverts commit 18927304f1
2020-09-04 13:33:23 +03:00
Dean Herbert
25e142965d
Strongly type and expose default beatmap information icon implementations for other rulesets
2020-09-04 15:01:32 +09:00
Salman Ahmed
18927304f1
Move adjustment to LegacySkinConfiguration as a default value
2020-09-03 16:29:38 +03:00
Dean Herbert
72cb65c22f
Update and add missing beatmap statistic icons to info wedge
2020-09-03 17:52:22 +09:00
Salman Ahmed
5180d71fd9
Attach an inline comment explaining how the value was reached
2020-09-03 06:09:52 +03:00
Salman Ahmed
e7eaaf8b02
Bring legacy slider border width closer to osu!stable
2020-09-03 04:46:26 +03:00
Salman Ahmed
99a68e880a
Merge remote-tracking branch 'upstream/master' into catch-combo-counter
2020-09-01 20:46:38 +03:00
Salman Ahmed
a0a4501008
Merge remote-tracking branch 'upstream/master' into catch-combo-counter
2020-09-01 20:17:25 +03:00
Dean Herbert
3d0121ceb1
Merge pull request #10022 from PajLe/auto-on-low-duration-spinners
2020-09-01 12:19:44 +09:00
Bartłomiej Dach
69ec2a76ef
Replace reaction time check with spins required check
2020-08-31 17:20:45 +02:00
PajLe
0655fc1473
changed comparing Duration to autoplay's reactionTime instead of 0
...
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-08-31 16:50:31 +02:00
Pavle Aleksov
fde4b03dab
added spinner duration check - skip HitObjectReplay if duration is 0
2020-08-31 16:21:00 +02:00
smoogipoo
acbeb5406f
Add/improve xmldoc
2020-08-31 13:33:41 +09:00
Bartłomiej Dach
3ab32a5d35
Change structure of old style spinner to be closer to stable
2020-08-29 23:29:29 +02:00
Dean Herbert
cd0a73883d
Merge pull request #9945 from smoogipoo/skin-colour-fix-2
...
Exactly reproduce osu!stable skin colour alphas
2020-08-29 20:06:26 +09:00
smoogipoo
1c1afa1c96
Move MaxCombo to base DifficultyAttributes
2020-08-28 19:16:20 +09:00
Bartłomiej Dach
43d6d2b2e8
Add back unstable rate display
2020-08-27 20:46:49 +02:00
Bartłomiej Dach
f152e1b924
Revert IStatisticRow changes
2020-08-27 20:13:44 +02:00
Bartłomiej Dach
05e725d59f
Add unstable rate statistic to rulesets in which it makes sense
2020-08-26 22:06:29 +02:00
Bartłomiej Dach
bbb3d7522e
Scope up return type to IStatisticRow
2020-08-26 19:24:12 +02:00
smoogipoo
ab8d9be095
Move out into a separate method
2020-08-25 15:16:41 +09:00
Salman Ahmed
cf6b34db1e
Merge remote-tracking branch 'upstream/master' into catch-combo-counter
2020-08-22 13:07:28 +03:00
smoogipoo
08078b9513
Rename method to remove "InitialColour" namings
2020-08-22 00:56:29 +09:00
smoogipoo
16a2ab9dea
Update osu with legacy colour setters
2020-08-22 00:20:33 +09:00
Salman Ahmed
deb5cc752b
Merge remote-tracking branch 'upstream/master' into catch-combo-counter
2020-08-19 08:39:58 +03:00
Salman Ahmed
422100192c
Move HasFont to legacy skin extensions class instead
2020-08-19 07:58:23 +03:00
smoogipoo
da07354f05
Fix some judgements potentially giving wrong score
2020-08-18 19:51:16 +09:00
Bartłomiej Dach
5f35b3ebb9
Fix constant casing
2020-08-15 20:44:02 +02:00
Ron B
390e872730
Fix acoording to review
2020-08-15 21:34:17 +03:00
Ron B
a1079bac32
Move frequency values into consts
2020-08-15 21:19:47 +03:00
Ron B
40445d0005
replicate osu-stable behaviour for spinningSample frequency
2020-08-15 21:07:44 +03:00
Ron B
07c25d5a78
Move spinnerFrequencyModulate set to ApplySkin
2020-08-15 20:51:33 +03:00
Ron B
61de3c7540
Replace accidental tab with spaces
2020-08-15 20:18:56 +03:00
Ron B
896a87e629
Replace accidental tab with spaces
2020-08-15 20:14:36 +03:00
Ron B
5c11270b98
Add SpinnerFrequencyModulate skin config option
2020-08-15 20:12:06 +03:00
Dan Balasescu
b7ae70ff96
Merge branch 'master' into fix-skinnable-sound-mute
2020-08-14 19:01:32 +09:00
Dean Herbert
662281d727
Adjust legacy spinners to fade in later
...
Matches stable 1:1 for legacy skins. I've left lazer default as it is
because changing to use the shorter apperance looks bad. This will
probably change as we proceed with the redesign of the default skin.
2020-08-13 18:20:46 +09:00
Dean Herbert
05b06e7451
Merge branch 'master' into fix-skinnable-sound-mute
2020-08-12 22:01:04 +09:00
Bartłomiej Dach
4f3f95540b
Check for zero rate to prevent crashes on unpause
2020-08-11 22:34:46 +02:00
Bartłomiej Dach
bcaaf25278
Fix Spun Out mod being affected by rate-changing mods
2020-08-11 22:04:18 +02:00
Bartłomiej Dach
cca78235d5
Replace CumulativeRotation with RateAdjustedRotation
2020-08-10 23:02:06 +02:00
Dean Herbert
365aae799e
Merge branch 'master' into fix-skinnable-sound-mute
2020-08-10 23:55:51 +09:00
Bartłomiej Dach
a636c7052c
Merge branch 'master' into adujustable-skinnablesound
2020-08-08 21:51:47 +02:00
Dean Herbert
0d1f273603
Merge branch 'master' into fix-skinnable-sound-mute
2020-08-08 23:24:03 +09:00
Dan Balasescu
d8ffc00f75
Merge pull request #6345 from frenzibyte/expand-number-piece-on-old-skins
...
Expand number piece for legacy old skins
2020-08-07 17:18:36 +09:00
smoogipoo
3c3756e42d
Merge branch 'master' into expand-number-piece-on-old-skins
2020-08-07 16:36:58 +09:00
smoogipoo
bce3f3952f
Split out variable declaration
2020-08-07 16:36:40 +09:00
Dan Balasescu
3c8fe12ccf
Merge branch 'master' into playfield-shift
2020-08-07 16:27:03 +09:00
Dean Herbert
e3105fd4c8
Add more resilient logic for whether to avoid playing SkinnableSound on no volume
2020-08-06 19:16:26 +09:00
smoogipoo
9a00ad48c6
Update components to use extension methods
2020-08-06 14:43:39 +09:00
Salman Ahmed
9465e7abe1
Rename sprites container to "circleSprites"
2020-08-05 23:45:00 +03:00
Salman Ahmed
43161697f8
Fix wrong english
2020-08-05 23:42:05 +03:00
Sebastian Krajewski
2c73fc0e1b
Merge branch 'master' into playfield-shift
2020-08-05 22:34:43 +02:00
Salman Ahmed
1ab6110c05
Apply fade out to the number piece with quarter the pieces duration
2020-08-05 20:07:26 +03:00
Salman Ahmed
84f6b7608c
Remove misleading ExpandNumberPiece lookup
2020-08-05 20:05:53 +03:00
Dean Herbert
bb73489ae5
Fix very short spinners being impossible to complete
2020-08-05 18:46:58 +09:00
smoogipoo
24bc9b33b1
Always place spinners behind hitcircles/sliders
2020-08-05 15:40:45 +09:00
Salman Ahmed
2771c95bec
Merge remote-tracking branch 'upstream/master' into expand-number-piece-on-old-skins
2020-08-04 22:17:54 +03:00
Sebastian Krajewski
9fb7b8f3d8
Rename the property to "AlignWithStoryboard"
2020-08-04 15:43:33 +02:00
Salman Ahmed
29053048ff
Add support to use legacy combo fonts for the counter on legacy skins
2020-08-03 21:40:20 +03:00
Sebastian Krajewski
675f618b28
Apply playfield's offset only in play mode
2020-08-03 14:18:45 +02:00
Sebastian Krajewski
c48648ea2a
Add playfield shift like in osu-stable
2020-08-03 13:00:36 +02:00
smoogipoo
cd9896c35e
Merge branch 'master' into spinner-spinning
2020-08-01 01:06:53 +09:00
Dean Herbert
180afff805
Ensure damp is always positive exponent
2020-08-01 00:39:04 +09:00
Dean Herbert
bb01ee5be9
Fix trackign alpha not being applied
2020-08-01 00:27:00 +09:00
Dean Herbert
9e244be489
Use better conditional for choosing which spinner type to use
...
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2020-08-01 00:05:04 +09:00
Dean Herbert
186b452331
Apply common multiplication refactor
2020-07-31 14:48:56 +09:00
Dean Herbert
86784e30ad
Fix spacing
2020-07-31 09:54:30 +09:00
Dean Herbert
cd570433f4
Move private methods to bottom of class
2020-07-31 09:04:20 +09:00
Dean Herbert
8e49256a5c
Rename and split up statement to make more legible
2020-07-31 09:03:29 +09:00
Dean Herbert
38a4bdf068
Add spinner spin sample support
2020-07-30 19:34:59 +09:00
Dean Herbert
ec0d7760af
Move todo?
2020-07-30 13:07:11 +09:00
Dean Herbert
41c0f7557a
Remove traceable spinner reference for now
2020-07-30 12:56:30 +09:00
Dean Herbert
c1085d49d3
Add more xmldoc
2020-07-30 12:55:34 +09:00
Dean Herbert
19fb350cd8
Move offset and scale to constant
2020-07-30 12:51:05 +09:00
Dean Herbert
743d165319
Add old style spin metre
2020-07-30 12:32:19 +09:00
Dean Herbert
d2b3fe1e7b
Add scale to old legacy spinner
2020-07-30 12:08:04 +09:00
Dean Herbert
4d822742e8
Add scale and tint to new legacy style spinner
2020-07-30 12:05:19 +09:00
Dean Herbert
54fee7e716
Simplify and standardise scale for default display
2020-07-30 11:50:13 +09:00
Dean Herbert
64c7ae7686
Fix hit transforms not playing out correctly
2020-07-30 11:25:49 +09:00
Dean Herbert
ca21f038e0
Add xmldoc for legacy classes
2020-07-30 10:35:48 +09:00
Dean Herbert
2b71ffa2ed
Add back legacy implementations
2020-07-29 22:32:21 +09:00
Dean Herbert
023feaf438
Refactor to centralise implementation into a single component
...
Turns out this is a better way forward.
2020-07-29 22:31:52 +09:00
Dean Herbert
2a5e9fed4d
Move default background implementation out of DrawableSpinner
2020-07-29 18:15:19 +09:00
Dean Herbert
2cd6e89cb0
Move default centre implementation out of DrawableSpinner
2020-07-29 18:02:12 +09:00
Dean Herbert
1c00cf95d5
Add initial support for spinner middle skinning
2020-07-29 16:55:47 +09:00
Dean Herbert
e98154b432
Add initial support for spinner background layer
2020-07-29 16:37:32 +09:00
Dean Herbert
d01d1ce3f1
Add initial support for spinner disc skinning
2020-07-29 16:25:10 +09:00
Dean Herbert
f97656351d
Merge branch 'master' into scaleMod
2020-07-28 18:55:07 +09:00
Dan Balasescu
bf6cf2144a
Merge pull request #9699 from peppy/fix-autopilow-wind-up
...
Fix Autopilot mod incompatibility with WindUp/WindDown
2020-07-28 18:49:52 +09:00
Dean Herbert
3cb1cc0555
Merge branch 'master' into scaleMod
2020-07-28 15:05:35 +09:00
Dean Herbert
afceab685b
Merge pull request #9688 from peppy/less-spinner-bonus-score
...
Reduce spinner tick and bonus score
2020-07-28 14:21:48 +09:00
Dean Herbert
72c8f0737e
Fix Autopilot mod incompatibility with WindUp/WindDown
2020-07-28 14:18:21 +09:00
Dan Balasescu
89f2d7d38a
Merge branch 'master' into less-spinner-bonus-score
2020-07-28 13:32:55 +09:00
Dean Herbert
dc577aa6fa
Fix display of bonus score
2020-07-28 11:22:58 +09:00
Bartłomiej Dach
7ad3101d08
Bring back custom fade-out delay if hit lighting is on
2020-07-27 19:21:01 +02:00
Bartłomiej Dach
21ae33e284
Determine whether to show lighting at prepare time
2020-07-27 19:07:21 +02:00
Bartłomiej Dach
bbc7d69524
Add failing test cases
2020-07-27 19:07:21 +02:00
Dean Herbert
10101d5b31
Reduce spinner tick and bonus score
2020-07-27 18:06:14 +09:00
Salman Ahmed
5e7237bf56
Fix incorrect default hitcircle font overlapping applied to legacy skins
2020-07-27 10:29:16 +03:00
Dean Herbert
a6a7961af9
Change div to subtraction to fix calculation
2020-07-24 22:09:25 +09:00
Dean Herbert
dd45f0bd40
Adjust max spins to "match" stable
2020-07-24 21:10:46 +09:00
Dean Herbert
82e4050fdd
Fix xmldoc
2020-07-24 19:41:34 +09:00
Dean Herbert
eb84f25036
Adjust maximum spins to roughly match stable
2020-07-24 19:34:13 +09:00
Dean Herbert
0050f6348f
Merge branch 'master' into add-spinner-bonus-score
2020-07-23 23:05:04 +09:00
smoogipoo
c348599189
Merge branch 'master' into add-slider-slide-support
2020-07-23 21:24:45 +09:00
smoogipoo
f883cb85d7
Null out the sample too
2020-07-23 21:24:31 +09:00
Dan Balasescu
f106106dc4
Merge pull request #9648 from peppy/fix-slider-ball-rotation
...
Fix slider ball rotation being applied to follow circle and specular layer
2020-07-23 19:39:58 +09:00
Dean Herbert
113fac84dd
Fix circle container type
2020-07-22 21:14:04 +09:00
Dan Balasescu
372754f1a2
Merge pull request #9649 from peppy/hide-repeat-judgements
...
Hide slider repeat judgements temporarily
2020-07-22 20:36:00 +09:00
Dan Balasescu
a640541324
Merge pull request #9612 from peppy/input-handler-updates
...
Input handler updates in line with framework changes
2020-07-22 20:30:32 +09:00
Dean Herbert
2c62b23d85
Update naming
2020-07-22 19:53:45 +09:00
Dean Herbert
bd6a51f545
Hide slider repeat judgements temporarily
2020-07-22 19:30:10 +09:00
Dean Herbert
53a9ac3c1a
Fix slider ball rotation being applied to follow circle and specular layer
2020-07-22 19:06:39 +09:00
Dean Herbert
2126f6bffc
Add slider "sliding" sample support
2020-07-22 16:37:58 +09:00
Dean Herbert
bc079fccf5
Add health drain for spinner ticks
2020-07-21 19:52:16 +09:00
Dean Herbert
1560e1786a
Revert back to bool for application
2020-07-21 19:48:44 +09:00
Dean Herbert
7f2ae694cc
Simplify rewind handling
2020-07-21 19:21:30 +09:00
Dean Herbert
947f4e0d4c
Move tick handling to DrawableSpinner itself
2020-07-21 19:20:19 +09:00
Dean Herbert
05102bc1ba
Split ticks up into bonus and non-bonus
2020-07-21 18:22:37 +09:00
Salman Ahmed
35ad409da6
Fix spinner bonus ticks samples not actually playing
2020-07-21 06:59:29 +03:00
Dean Herbert
4dd40542d5
Rename rotation set method to match others
2020-07-21 11:31:29 +09:00
Dean Herbert
f48984920d
Change bonus volume logic to work
2020-07-21 11:31:29 +09:00
Dean Herbert
35d53139e7
Merge branch 'master' into add-spinner-bonus-score
2020-07-21 11:21:17 +09:00
Dean Herbert
e06d3c5812
Minor adjustments to tick clearance
2020-07-20 17:52:59 +09:00
Dean Herbert
4cbc176cb6
Add less fill and more transparency
2020-07-20 17:50:11 +09:00
Dean Herbert
33e58bb7db
Fix sizing and colour not correct on hit
2020-07-20 17:22:30 +09:00
Dean Herbert
55d921ef85
Improve feel of animation
2020-07-20 17:22:30 +09:00
Dean Herbert
648e414c14
Update InputHandlers in line with framework changes
2020-07-19 11:39:11 +09:00
Fabian
56b0094d43
Update slider labels & descriptions
2020-07-18 23:10:05 +02:00
Fabian
0975610bf7
Increased maximum start modifier higher (15x -> 25x)
...
Tried playing around with higher values and personally had quite fun when the circles covered the whole screen so I raised the max modifier to 25. Works best with an AR of <6.
2020-07-18 02:21:55 +02:00
Fabian
a6cf77beae
Clarified what the slider value is
2020-07-17 17:53:20 +02:00
Fabian
9857779d42
Added slider for the grow/deflate mod
2020-07-17 16:12:01 +02:00
Dan Balasescu
f3a498482b
Merge pull request #9553 from peppy/difficulty-adjust-range-match-stabl
...
Change difficulty adjust mod to match stable range of 0-10
2020-07-14 20:12:28 +09:00
Dean Herbert
b59e4f8a7e
Change difficulty adjust mod to match stable range of 0-10
2020-07-14 08:15:14 +09:00
smoogipoo
8a3cadc111
Fix judgement animations not resetting on use
2020-07-13 21:21:59 +09:00
Dean Herbert
dd025262d0
Fix one more nullref
2020-07-10 22:48:34 +09:00
Dean Herbert
0a61f80c8b
Remove result nullable check
2020-07-10 22:39:35 +09:00
Dean Herbert
13205319f3
Fix null reference if hit lighting is disabled
2020-07-10 22:37:29 +09:00
Yao Chung Hu
d40f209f4b
Move Playfield Border to OsuPlayfield Ruleset
2020-07-10 07:36:21 -05:00
Dean Herbert
024fb52726
Fix unnecessary using
2020-07-10 19:05:31 +09:00
Dean Herbert
c9e54651d5
Merge branch 'master' into judgement-pooling
2020-07-10 18:51:42 +09:00
Dean Herbert
f872343bab
Make Apply virtual to further simplify application process
2020-07-10 18:35:20 +09:00
Dean Herbert
8aff828dfe
Move application of judgements to Apply method
2020-07-10 18:34:31 +09:00
Dean Herbert
1b9f09f9c2
Merge branch 'master' into osu-cursor-visibility
2020-07-10 17:15:34 +09:00
Dean Herbert
3138cc455c
Merge branch 'master' into judgement-pooling
2020-07-10 17:15:19 +09:00
Dean Herbert
bd5957bc0a
Add dynamic compilation exclusion rules for ruleset types
2020-07-10 14:49:44 +09:00
Dean Herbert
c562435267
Adjust cursor transforms for better feel
2020-07-10 14:44:30 +09:00
Dean Herbert
a21c2422c5
Make cursor centre portion non-expanding and more visible with outline
2020-07-10 14:44:20 +09:00
Dean Herbert
e211ba5e7d
Fix cursor scale potentially not being updated if set too early
2020-07-10 14:43:30 +09:00
Dean Herbert
efb2c2f4ae
Rename variable to be more clear on purpose
2020-07-09 12:01:00 +09:00
Bartłomiej Dach
4cd874280c
Add clarifying xmldoc for RotationAbsolute
2020-07-08 22:37:50 +02:00
Bartłomiej Dach
213dfac344
Fix broken spinner rotation logic
2020-07-08 22:37:50 +02:00
Dean Herbert
e6ec883084
Remove slider tail circle judgement requirements
2020-07-08 20:21:44 +09:00
Dean Herbert
51050ec4ef
Add per-result type pooling
2020-07-06 12:54:39 +09:00
Bartłomiej Dach
d229993e5c
Use RotationAbsolute instead
2020-07-05 02:12:26 +02:00
Bartłomiej Dach
cd6bdcdb88
Replace further spinner transforms with manual lerp
2020-07-05 00:25:01 +02:00
Dean Herbert
ffec4298a7
Use DrawablePool for DrawableJudgements
2020-07-04 16:45:50 +09:00
Dean Herbert
c095753f24
Add better line smoothing
2020-06-25 19:02:04 +09:00
Dean Herbert
fd13c0a6dd
Standardise line thickness
2020-06-25 18:44:04 +09:00
Dean Herbert
0d3bc1ac29
Add basic heatmap colour scaling based on peak value
2020-06-24 22:29:30 +09:00
Dean Herbert
9119f41604
Merge branch 'master' into results-screen-statistics-overlapping-transition
2020-06-24 18:22:51 +09:00
Dean Herbert
14ad3835ff
Update naming
2020-06-23 21:27:01 +09:00
smoogipoo
cb03e6faa9
Improve visual display of arrow
2020-06-22 21:09:47 +09:00
smoogipoo
beb6e6ea88
Buffer the accuracy heatmap for performance
2020-06-22 21:00:13 +09:00
