1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 15:47:26 +08:00
Commit Graph

3091 Commits

Author SHA1 Message Date
Bartłomiej Dach
1ba586a683 Revert overlooked AR<8 speed buff
Pull request #11107 introduced changes in osu! performance calculation,
related to a scaling coefficient applied to the speed and aim skills.
The coefficient in question was dependent on the approach rate of
a map. During a post-merge review of that PR, it was spotted that
the scaling coefficient for speed also had a 10x buff applied for AR<8,
which could reach magnitudes as large as 80% on AR0, which seems quite
exorbitant. This change was not discussed or mentioned anywhere in the
review process.

Revert back to the old multiplier of 0.01 rather than 0.1 for AR<8. The
negative slope through AR0 to 8 is retained in its previous form.
2021-01-13 17:59:29 +01:00
Bartłomiej Dach
303cc62ee7 Transfer flags indicating if settings were changed 2021-01-06 22:46:46 +01:00
TheOmyNomy
355ecc4499 Change cursor trail blending mode to match stable 2020-12-29 12:37:57 +11:00
Dean Herbert
a411b26a09
Remove unnecessary clamp
Co-authored-by: Joseph Madamba <madamba.joehu@outlook.com>
2020-12-24 10:51:24 +09:00
Dean Herbert
dec997c0f4 Fix flashlight not updating its position during replay rewinding
Closes #11260
2020-12-23 14:44:38 +09:00
Dean Herbert
87176edca1 Fix crash when attempting to scale two hitobjects on the same axis 2020-12-22 12:52:57 +09:00
Bartłomiej Dach
569caa9500
Merge branch 'master' into add-bundle-header 2020-12-17 20:55:24 +01:00
Dean Herbert
76ffe31855
Merge pull request #11138 from smoogipoo/stanr-nf-multiplier
Port StanR's NF multiplier changes
2020-12-17 18:59:46 +09:00
Dean Herbert
88b3bf06e8 Merge branch 'master' into add-bundle-header 2020-12-16 13:40:15 +09:00
Dan Balasescu
8bdef0ff55
Code quality fix
Co-authored-by: Dean Herbert <pe@ppy.sh>
2020-12-15 13:18:41 +09:00
Xexxar
54827d4e96 fixed low 50s count still penalizing high obj count maps 2020-12-14 12:41:24 -06:00
Dean Herbert
1793385e96 Pass a score to the replay recorder to allow reading more general scoring data 2020-12-14 16:52:14 +09:00
Dan Balasescu
66f43e523b
Merge pull request #11147 from Xexxar/miss-penalty-curve
Change miss penalty curve for speed and aim pp awarded in the osu! ruleset
2020-12-14 14:25:26 +09:00
Xexxar
1dce446c52 Merge branch 'miss-penalty-curve' 2020-12-11 10:49:31 -06:00
Xexxar
b7872a54b8 small factor rebalance 2020-12-11 10:48:53 -06:00
Xexxar
a5a66e71f9 Merge branch 'miss-penalty-curve' 2020-12-11 10:22:04 -06:00
Xexxar
abc8a2982c swapped ^.75 buff onto speed instead of aim 2020-12-11 08:20:56 -06:00
Xexxar
c20117f0fb Merge branch 'miss-penalty-curve' 2020-12-11 08:02:39 -06:00
Xexxar
544160798b cleaned up mistakes and made quality changes 2020-12-11 08:01:45 -06:00
Xexxar
fd0d793c69 changed the comment to reflect the change 2020-12-10 18:51:54 -06:00
Xexxar
e45417d4fe Merge branch 'lowacc-nerf' 2020-12-10 14:24:42 -06:00
Xexxar
1f2946d64c changed miss penalty curve to scale with totalhits 2020-12-10 14:21:06 -06:00
Xexxar
cc5639d2b4 added unneeded whitespace 2020-12-10 09:48:40 -06:00
smoogipoo
7c2f506b79 Port StanR's NF multiplier changes 2020-12-10 17:10:29 +09:00
Xexxar
54abc3bd4d revert aim curve and add new 50s nerf 2020-12-09 20:07:52 -06:00
Xexxar
149651dec1 Merge branch 'lowacc-nerf' of https://github.com/Xexxar/osu into lowacc-nerf 2020-12-09 13:05:11 -06:00
Xexxar
d604c51cbd capped scaling at OD 8 to prevent overscaling 2020-12-09 13:04:14 -06:00
Xexxar
a2bd8ece10
Merge branch 'master' into lowacc-nerf 2020-12-09 12:06:33 -06:00
Xexxar
05ad9aae8d changed curve to linear OD + acc based curve 2020-12-09 11:57:01 -06:00
Xexxar
cfc34a63bd realized i accidently deleted the OD scaling 2020-12-09 11:21:03 -06:00
Xexxar
7e3fcfe437 fixed issue with comment 2020-12-09 10:35:48 -06:00
smoogipoo
47a93d8614 Adjust osu! hitobject fade-ins to support AR>10 2020-12-10 00:37:19 +09:00
smoogipoo
ac91f0e270 Add extended limits to difficulty adjustment mod 2020-12-10 00:37:19 +09:00
Xexxar
748035e80a changes to acc scaling curve for speed and aim pp 2020-12-08 16:53:52 -06:00
smoogipoo
168ba62500 Port StanR's dynamic SO pp changes 2020-12-08 22:09:48 +09:00
Dan Balasescu
c3cb82489b
Merge pull request #11107 from Xexxar/ar11-nerf
osu! PerformanceCalc Short Map AR11 Nerf
2020-12-08 12:51:26 +09:00
smoogipoo
57b7ef88e2 Fix spacing 2020-12-08 12:12:53 +09:00
ekrctb
0d88ff3404 Adjust namespace 2020-12-07 12:27:12 +09:00
ekrctb
c905df8a77 Move LegacySkinTransformer 2020-12-07 12:26:58 +09:00
Xexxar
cf3fbe0b0b osuDifficulty ar11 nerf 2020-12-06 18:06:36 -06:00
ekrctb
0ed9989a82 Adjust namespace 2020-12-04 20:25:49 +09:00
ekrctb
626956febd Move some files from Drawables to Skinning.Default namespace 2020-12-04 20:25:12 +09:00
ekrctb
245be2c5ed Adjust namespace 2020-12-04 20:21:53 +09:00
ekrctb
a12b049154 Move piece files in Osu ruleset 2020-12-04 20:11:35 +09:00
Dean Herbert
2f4b3a2d4c
Merge branch 'master' into fix-hidden-increased-visibility-state-2 2020-12-04 13:38:01 +09:00
Dean Herbert
5db15a6b26
Merge branch 'master' into fix-hidden-mod-crash 2020-12-04 12:50:02 +09:00
Dean Herbert
5ded4b9faa
Merge branch 'master' into dho-remove-onparentreceived 2020-12-04 11:04:56 +09:00
Bartłomiej Dach
4d739f11a8 Fix spinner ticks getting increased visibility state
Regressed in #10696. The old `IsFirstHideableObject()` method did not
consider nested hitobjects, while its replacement -
`IsFirstAdjustableObject()` - did. Therefore, spinner ticks could be
considered first adjustable objects, breaking the old logic.

There is no need to match over `SpinnerBonusTick`, as it inherits from
`SpinnerTick`.
2020-12-03 22:51:59 +01:00
smoogipoo
09af4bbd57 Merge branch 'dho-remove-onparentreceived' into fix-hidden-mod-crash 2020-12-03 20:10:16 +09:00
smoogipoo
0bdf99b97a Remove OnParentReceived() 2020-12-03 20:08:42 +09:00
smoogipoo
73e99718bc Change order of OnParentReceived() 2020-12-03 20:06:26 +09:00
smoogipoo
e3bbc2b128 Rework osu! hidden mod to avoid storing hitobjects 2020-12-03 14:45:56 +09:00
smoogipoo
e831c797f3 Merge branch 'master' into hit-sample-pooling 2020-12-02 14:45:24 +09:00
Dean Herbert
71a121389b
Merge pull request #11033 from smoogipoo/immutable-hit-samples
Make HitSampleInfo immutable
2020-12-02 14:44:26 +09:00
Dean Herbert
d344268df7
Merge pull request #11028 from peppy/osu-fade-slider-body-on-hit
Hide slider body immediately on successful hit when snaking is enabled
2020-12-02 12:59:26 +09:00
Dan Balasescu
be3fed3072
Merge pull request #11024 from peppy/fix-slider-point-drag-offset
Fix slider control point dragging not correctly accounting for drag deadzone
2020-12-02 11:10:06 +09:00
Dan Balasescu
8dfe3a21cc
Merge pull request #11025 from peppy/editor-slider-control-point-scaling
Scale slider control point display in line with circle size
2020-12-02 11:06:00 +09:00
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 - the same fix is applied here, but in the miss case.
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