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

352 Commits

Author SHA1 Message Date
Dean Herbert
3f93aa1507 Fix traceable sliders incorrectly being opaque
Closes https://github.com/ppy/osu/issues/14449.
Regressed in https://github.com/ppy/osu/pull/14205.
2021-08-31 20:13:54 +09:00
Endrik Tombak
ef367c6547 Move implementation to be legacy only 2021-08-16 22:52:19 +03:00
smoogipoo
7cc0a2a76f Refactor to fix InterpolateMovements=false 2021-08-13 12:10:33 +09:00
smoogipoo
5241029513 Use new FadeExponent shader uniform 2021-08-13 10:27:26 +09:00
TheOmyNomy
1069f9d501 Always add cursor trail for legacy cursor with disjoint trail 2021-08-13 00:13:03 +10:00
smoogipoo
f86ef54e93 Fix incorrect legacy slider body alpha 2021-08-10 17:38:51 +09:00
TheOmyNomy
24accdcab0 Add LegacyUtils class with non linear colour interpolation method 2021-08-09 18:56:47 +10:00
TheOmyNomy
140d29d537 Use helper methods instead of local valueAt() method 2021-08-08 23:54:35 +10:00
TheOmyNomy
9e805dcd44 Fix legacy slider body colour interpolation 2021-08-08 21:27:32 +10:00
Bartłomiej Dach
8e102280b7 Revert & disable case with two contradicting inspections
Leaving the `false` default value without the suppression triggers
`RedundantArgumentDefaultValue`, while removing it triggers
`BaseMethodCallWithDefaultParameter`.

Disable the former, because a single redundant parameter is less bad
than silent breakage if the default value of `propagateChildren` in the
base method ever changes.
2021-07-05 20:21:44 +02:00
PercyDan54
e1c646b9b2
Remove redundant arguments 2021-07-05 23:52:39 +08:00
Dean Herbert
ec71deec51 Remove some mentions of "lazer"
I am aware there are more throughout the codebase but intentionally left
the remaining mentioned for one reason or another. The intention here is
to mainly change user-facing versioning to change the positioning of the
"lazer" term (to be where we would expect "cuttingedge" or "beta" to
be).
2021-07-04 12:41:27 +09:00
Dean Herbert
1b0aadcc6f Merge branch 'master' into transformers-per-skin 2021-06-22 16:03:15 +09:00
Salman Ahmed
999bf27eae Remove unnecessary abstraction of ApproachCircle property 2021-06-21 12:07:00 +03:00
Salman Ahmed
ba15f7c19b Move ApproachCircle out of the scale container and revert relevant changes 2021-06-21 10:47:38 +03:00
Salman Ahmed
036b745425 Remove no longer needed LegacySpinnerApproachCircle 2021-06-21 08:41:10 +03:00
Salman Ahmed
42edbe4fb9 Move ApproachCircle implementation into per-style 2021-06-21 08:40:38 +03:00
Salman Ahmed
68e28f4903 Implement IHasApproachCircle in DrawableHitCircle as well 2021-06-21 07:35:07 +03:00
Salman Ahmed
01478d780d Generalize IHasSpinnerApproachCircle from being spinner-specifc 2021-06-21 03:43:11 +03:00
Salman Ahmed
72155a7c52 Replace if pattern-matching check with switch cases instead 2021-06-21 03:37:50 +03:00
Salman Ahmed
c3217fd8b1 Remove leftover approach circle skin component 2021-06-19 20:10:32 +03:00
Salman Ahmed
c04b09520d Replace spinner approach circle proxying logic with hooking up to OnSkinChange in mod 2021-06-19 20:06:28 +03:00
Salman Ahmed
d6b9436151 Proxy spinner approach circle before the spinner overlay components 2021-06-18 20:34:25 +03:00
Salman Ahmed
843c8bd7a4 Move spinner approach circle to its own SkinnableDrawable 2021-06-18 20:33:50 +03:00
Salman Ahmed
c9458fd9ce Hide spinner approach circle in "Hidden" mod 2021-06-18 06:23:54 +03:00
Salman Ahmed
9d9892e99e Add legacy spinner approach circle implementation 2021-06-17 04:58:18 +03:00
Dean Herbert
4b45d8318e
Merge branch 'master' into transformers-per-skin 2021-06-16 16:37:28 +09:00
Salman Ahmed
52145c9237 Assign skinnable colour to spinner-background with correct default 2021-06-15 16:17:05 +03:00
Salman Ahmed
a85a592f70 Add lookup for spinner background colour 2021-06-15 16:16:25 +03:00
Salman Ahmed
fbb856d84b Call base when overriding lookup methods
Rather than arbitrarily accessing `Skin` here and there.
2021-06-11 12:44:44 +03:00
Salman Ahmed
cf40282f1f Convert LegacySkinTransformers to accept raw ISkins rather than a full ISkinSource 2021-06-09 22:49:31 +03:00
ekrctb
5418e895ae Remove useless ClearTransforms
The transforms are cleared by DHO before `ApplyCustomUpdateState` is invoked.
2021-06-09 16:50:13 +09:00
ekrctb
610cdaea98 Fix circle piece animation is sometimes not playing when a replay is rewound 2021-06-09 16:14:55 +09:00
ekrctb
555ab8fccd Fix event not unregistered on dispose 2021-06-09 12:35:14 +09:00
ekrctb
4707918c6a Fix hit circle animation when a replay is rewound 2021-06-09 10:53:52 +09:00
Dean Herbert
88b87b98a8 Fix slider ball layer sources 2021-06-08 12:10:14 +09:00
Dean Herbert
9ebafb1ec0 Fix cursor trail logic 2021-06-06 22:26:27 +09:00
Dean Herbert
06275a6a7d Merge branch 'master' into legacy-skin-default-fallback 2021-06-04 16:00:30 +09:00
Dean Herbert
f62a2747f6 Add legacy implementation 2021-06-04 14:51:35 +09:00
Dean Herbert
5953674737 Tidy up constants 2021-06-04 14:14:51 +09:00
Dean Herbert
ff70f99da2 Merge branch 'master' into kiai 2021-06-04 13:50:12 +09:00
Dan Balasescu
c065f761c7
Merge branch 'master' into legacy-skin-default-fallback 2021-06-02 19:08:52 +09:00
ekrctb
c06ff3c623 Remove defunct Animate calls 2021-06-02 11:46:28 +09:00
ekrctb
b82190e157 Fix hit circle animation reset when skin is changed
The transforms applied in `Animate` call was not applied because the piece is recreated.
2021-06-02 11:32:24 +09:00
Dean Herbert
33577cbad5 Fix multiple issues with default lookups 2021-05-31 21:29:47 +09:00
Dean Herbert
88ed95e012 Add FindProvider lookup function 2021-05-31 21:29:47 +09:00
Dean Herbert
17574833fb Update other transformers with similar refactored logic 2021-05-30 19:15:59 +09:00
Salman Ahmed
fbc316ea1d Fix legacy skin transformers potentially ignoring source implementations 2021-05-29 21:23:22 +03:00
Dean Herbert
004798d61d Update Legacy components to not require skin in ctor 2021-05-11 18:39:14 +09:00
smoogipoo
1e0ee3cd61 Merge branch 'master' into fix-editor-slider-repeat-animation 2021-04-26 16:45:04 +09:00
smoogipoo
0d0b4ea78a Rewrite comment to hopefully be more readable 2021-04-26 15:47:37 +09:00
smoogipoo
f70e45b199 Prevent adding null enumerable 2021-04-26 15:35:08 +09:00
Dean Herbert
aa7ade8186 Expose presence of MainCirclePiece via an interface 2021-04-26 15:22:17 +09:00
smoogipoo
6182181ea1 Fix simultaneous slider input not allowing both keys 2021-04-26 15:20:29 +09:00
Dean Herbert
47a4a07024 Split out animation triggering of MainCirclePiece to be interface driven 2021-04-21 19:15:10 +09:00
Salman Ahmed
367dafab56 Apply CursorCentre to old-style legacy cursor trail 2021-04-14 08:20:18 +03:00
Salman Ahmed
ad53ababe8 Fix wrong default
Ah, soz
2021-04-14 08:16:46 +03:00
Salman Ahmed
bf5ed12b75 Add support for legacy skin CursorCentre setting 2021-04-14 06:33:54 +03:00
Salman Ahmed
f848ef5347 Add legacy spinner SPM counter support 2021-03-30 04:19:23 +03:00
Salman Ahmed
0bf84e473d Refactor spinner SPM counter for skinning purposes 2021-03-30 04:19:23 +03:00
Salman Ahmed
bada1e7189 Update legacy spinner bonus counter usage 2021-03-25 15:00:06 +03:00
Salman Ahmed
6aa0c9d8fd Merge branch 'master' into legacy-sprite-text-fonts 2021-03-25 14:52:01 +03:00
Dean Herbert
b4bccc19ba Refactor LegacySpriteText initialisation 2021-03-25 18:37:13 +09:00
Dean Herbert
c715b9b89e Merge branch 'master' into legacy-spinner-bonus 2021-03-25 18:09:25 +09:00
Dean Herbert
d10ff615fe Fix default skin's glow resetting fade on miss 2021-03-23 19:28:08 +09:00
Salman Ahmed
848adddd92 Use double.ToString(InvariantInfo) instead 2021-03-15 11:05:29 +03:00
Salman Ahmed
779c55d768 Fix potentially adding null legacy text to hierarchy 2021-03-14 03:27:47 +03:00
Salman Ahmed
43c1e1d217 Update existing usages
Resolve post-conflict issues
2021-03-13 06:09:07 +03:00
Salman Ahmed
115c186cb7 Move hit circle font from osu! ruleset 2021-03-13 06:05:36 +03:00
Salman Ahmed
98f6e16113 Move default spinner bonus counter to new DefaultSpinner 2021-03-13 05:59:42 +03:00
Salman Ahmed
774ebf50bc Move legacy spinner bonus counter to LegacySpinner 2021-03-13 05:59:42 +03:00
Salman Ahmed
8fdab5a7de Revert legacy spinner presence changes and bonus counter component
No longer necessary, after inlining legacy coordinates logic to `LegacySpinner` and limiting precisely-positioned legacy components there
2021-03-13 05:57:47 +03:00
Salman Ahmed
c4048c9831 Merge branch 'master' into legacy-spinner-bonus 2021-03-13 05:54:34 +03:00
smoogipoo
ea9b48d17d Remove unused using 2021-03-11 21:21:48 +09:00
smoogipoo
b5bdf235ca Slightly improve comments more 2021-03-11 21:21:44 +09:00
smoogipoo
8bc494b224 Adjust explanatory comments 2021-03-11 20:57:00 +09:00
Salman Ahmed
3f34981664 Fix incorrect spinner top offset calculation with clarification 2021-03-11 05:40:20 +03:00
Salman Ahmed
0549395869 Inline "legacy coordinates container" and add "spinner Y centre" const 2021-03-09 08:55:32 +03:00
Salman Ahmed
bb79da1aac Correct playfield shift counteract comment
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-03-09 00:34:00 +03:00
Salman Ahmed
0ad3073c1a
Use MathF utility class instead
Co-authored-by: Berkan Diler <b.diler@gmx.de>
2021-03-07 21:21:44 +03:00
Salman Ahmed
fbfaa378fc Move spinner top offset constant outside 2021-03-07 20:47:16 +03:00
Salman Ahmed
413cbb30a0
Reword playfield shift counteract comment
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-03-07 13:39:46 +03:00
Salman Ahmed
30f07aa9fc Add legacy spinner bonus counter piece 2021-03-06 20:27:56 +03:00
Salman Ahmed
3f1d36ee6b Add default spinner bonus counter piece 2021-03-06 20:27:56 +03:00
Salman Ahmed
c441e993ff Separate "gained bonus" to a read-only bindable 2021-03-06 20:27:56 +03:00
Salman Ahmed
1841a4d1c9 Extract legacy spinner presence to lazy field 2021-03-06 20:27:56 +03:00
Salman Ahmed
e4afe717d5 Publicize legacy coordinates container and sprite scale 2021-03-06 20:27:56 +03:00
Salman Ahmed
1525480e73 Demonstrate value of SPINNER_TOP_OFFSET to being more sensible 2021-03-06 19:18:40 +03:00
Salman Ahmed
d528ef426f Reposition legacy spinner components in-line with osu!stable 2021-02-28 22:59:22 +03:00
Salman Ahmed
41b43dd39a Add nested legacy-simulating coordinates container 2021-02-28 21:32:56 +03:00
Dean Herbert
1fd76ea3fb Apply changes to UI components overriding functions with changing signatures 2021-02-22 19:01:42 +09:00
smoogipoo
6bf40170db Rename SliderBall flag 2021-02-10 18:53:26 +09:00
smoogipoo
9519b7f7c1 Adjust comment 2021-02-10 18:43:14 +09:00
smoogipoo
18a29dcb96 Rename bindable member, reorder binds 2021-02-10 18:42:24 +09:00
Dean Herbert
b96a594546 Remove unnecessary initial call to HitObjectApplied bound method
Was causing test failures. Looks to be unnecessary on a check of when
HitObjectApplied is invoked.
2021-02-09 15:11:59 +09:00
smoogipoo
a5855f5d28 Move follow circle tracking to DrawableSliderHead 2021-02-05 17:33:48 +09:00
smoogipoo
ee3367d7c5 Add classic slider ball tracking 2021-02-05 17:14:23 +09:00
smoogipoo
3aa3692ed4 Disable snaking out when tracking is disabled 2021-02-05 15:56:13 +09:00
Bartłomiej Dach
ae08ef2543 Reset SPM counter state on DHO application 2021-01-29 20:32:45 +01:00
TheOmyNomy
355ecc4499 Change cursor trail blending mode to match stable 2020-12-29 12:37:57 +11: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
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
smoogipoo
c744db1b57 Rewind pooled DHOs into better states 2020-11-26 00:42:25 +09:00
Bartłomiej Dach
727a886fb3 Move spinner completion info into judgement 2020-11-14 23:08:47 +01: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
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
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
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
smoogipoo
400fcedf0f Remove stored hitobject references from skinnable components 2020-11-05 14:40:48 +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
048507478e Join declaration and specification 2020-10-06 14:12:46 +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
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
Dean Herbert
f0b5ba9534
Merge branch 'master' into skin-slider-end-circle-support 2020-10-05 17:45:51 +09: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
smoogipoo
fe818a020a Fix spinners not transforming correctly 2020-10-02 16:17:57 +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
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
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
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
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
e60e47ff66 Unbind events on disposal 2020-09-28 17:41:10 +09:00
Dean Herbert
8692c24dfc Fix extending spinners in editor causing them to disappear temporarily 2020-09-28 17:20:36 +09:00
Max Hübner
33d000e532 Add support for SpinnerNoBlink in legacy spinner 2020-09-26 16:25:57 +02:00
Dan Balasescu
0761aab42f
Merge branch 'master' into catch-combo-counter 2020-09-15 17:20:31 +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
Salman Ahmed
18927304f1 Move adjustment to LegacySkinConfiguration as a default value 2020-09-03 16:29:38 +03: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