1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-24 14:42:55 +08:00
Commit Graph

253 Commits

Author SHA1 Message Date
Alden Wu
d213f56f79 Align legacy followcircle anims to slider ticks 2022-07-19 02:08:53 -07:00
Dean Herbert
775c6c8374 Fix potential crash in editor from transform time going below zero 2022-07-15 19:29:37 +09:00
Dean Herbert
7ed4eb5815 Adjust transform logic to match osu-stable (and add TODOs for remaining oversights) 2022-07-15 17:17:55 +09:00
Alden Wu
66932f1af6 Move shared followcircle code into abstract base class 2022-07-14 17:11:01 -07:00
Alden Wu
48911b956a Remove ClearTransformsAfter call
A bit weird only having one call on its own; probably deserves an
entire PR dedicated to adding ClearTransformsAfter calls
2022-07-10 17:07:21 -07:00
goodtrailer
84dcd042f4 Protect duration calculations against unstable fps 2022-07-07 20:30:31 -07:00
goodtrailer
72fb1ae892 Add forgotten unsubscribes 2022-07-05 21:04:13 -07:00
goodtrailer
e6a05ce3e2 Slow down legacy followcircle animations 2022-07-03 13:51:30 -07:00
Dean Herbert
9a5431d93f Minor renaming / refactoring to use local parameter rather than DI'd object 2022-07-02 13:37:10 +09:00
goodtrailer
f2141715b8 Replace AsNonNull() with Assert() 2022-07-01 21:22:48 -07:00
goodtrailer
471b64bd20 Reinstate early return with comment
Whoops, didn't read the reply until after I pushed...
2022-07-01 21:19:54 -07:00
goodtrailer
6d6ffd35d0 Remove unused parameter 2022-07-01 21:14:53 -07:00
goodtrailer
2e3ff2c7e0 Prefer [Resolved] and LoadComplete 2022-07-01 21:12:36 -07:00
goodtrailer
76d4f86ca3 Make legacy slider ball fade out instantly 2022-07-01 18:21:03 -07:00
goodtrailer
0e0e9968ac Split ball and followcircle into default/legacy files 2022-06-29 01:23:35 -07:00
Dean Herbert
31a447fda0 Update parameter discards 2022-06-24 21:26:19 +09:00
Dan Balasescu
f8830c6850 Automated #nullable processing 2022-06-17 16:37:17 +09:00
Salman Ahmed
fe96e15b1b Update spinner approach circle to handle LegacySkinTransformer 2022-06-04 01:15:39 +03:00
Dean Herbert
a443200d0d Make dependency nullable to allow for safer disposal unbinding 2022-05-19 13:49:52 +09:00
Salman Ahmed
61078910a6 Handle all skin component types explicitly 2022-04-23 03:34:05 +03:00
Salman Ahmed
fd20c2bdcd Change circle/overlay sprite fields to protected for better test assertion 2022-04-20 00:24:28 +03:00
Salman Ahmed
a96664295b Fix nullability preprocessor placed over the copyright header 2022-04-19 19:48:44 +03:00
Salman Ahmed
033b556be5 Simplify texture lookup further 2022-04-19 19:44:35 +03:00
Dean Herbert
75a6e9fd7f Convert to use nullable and rearrange fields 2022-04-19 18:10:10 +09:00
Salman Ahmed
b067924ada Avoid applying state transforms when no object is present 2022-04-19 08:08:02 +03:00
Salman Ahmed
fd113953ac Rename prioritiyLookup and add xmldoc 2022-04-19 08:06:39 +03:00
Salman Ahmed
ec7bb876b5 Improve legacy circle texture lookup to match 1:1 with stable 2022-04-19 07:12:07 +03:00
Salman Ahmed
8d0dd3961e Add failing test cases 2022-04-19 07:12:07 +03:00
Dean Herbert
e4b2242719 Fix follow point animations not looping
Because they do in stable. I don't know why but let's go with it.

Resolves issue reported in https://github.com/ppy/osu/discussions/17072.
2022-03-21 18:29:13 +09:00
Susko3
19467e58c1 Remove unused params from BDL methods 2022-01-15 01:06:39 +01:00
Dean Herbert
408e8d5710 Fix null reference causing crash in KiaiFlashingDrawable
Can occur if there is no fallback graphics available. Previously would
work as it was only setting the `Texture`.

As reported in https://github.com/ppy/osu/discussions/16281.
2021-12-30 22:21:39 +09:00
Bartłomiej Dach
eea0fea69f
Add support for animated legacy hit circle overlay 2021-12-28 15:58:34 +01:00
Bartłomiej Dach
448c6ed515
Generalise KiaiFlashingSprite for arbitrary drawables 2021-12-28 15:58:34 +01:00
Dean Herbert
add39fbd4f Merge branch 'master' into fix-skin-layout-editor-crash 2021-10-28 06:24:24 +09:00
Dean Herbert
6944151486 Apply batch fixing of built-in types using var 2021-10-27 13:04:41 +09:00
Dean Herbert
93482414d6 Remove SkinConfiguration subclasses and allow configuration parsing for all skin types 2021-10-22 14:42:23 +09:00
Dan Balasescu
aa1bfc16d2
Merge pull request #14929 from peppy/gameplay-state
Replace `GameplayBeatmap` with `GameplayState`
2021-10-04 15:56:44 +09:00
Bartłomiej Dach
5e5cdaab5e
Privatise setter
Co-authored-by: Dean Herbert <pe@ppy.sh>
2021-10-03 19:14:01 +02:00
Bartłomiej Dach
abe0ced48c
Proxy slider head circle number along with overlay 2021-10-03 15:53:49 +02:00
Dean Herbert
32afd3f426 Replace all basic usages 2021-10-02 02:22:23 +09:00
Bartłomiej Dach
5bd09a4a30
Rename inner lambda parameter 2021-09-27 22:21:14 +02:00
Bartłomiej Dach
7a0499ad07
Fix repeat arrow texture not falling back to default legacy skin 2021-09-27 21:45:26 +02:00
smoogipoo
6c91d39c15 Remove GameplayClock dependency 2021-09-21 14:48:46 +09:00
smoogipoo
f0971cb90c Fix kiai spawner using wrong current time 2021-09-21 14:40:33 +09:00
Bartłomiej Dach
c911332540
Merge branch 'master' into correct-reverse-arrow-depth 2021-09-20 22:32:28 +02:00
Dean Herbert
20eeb36567 Avoid AliveObject enumeration when not in kiai section 2021-09-20 18:49:36 +09:00
Opelkuh
761da45f6a Revert af4c3727d77a16e2534df9bbf452336b5c544342 2021-09-19 14:00:56 +02:00
Opelkuh
af4c3727d7 Fix build errors 2021-09-19 04:39:35 +02:00
Opelkuh
1d7d779f66 Merge branch 'master' into add-legacy-star-particles 2021-09-19 04:34:35 +02:00
Opelkuh
3f8454cb76 Remove abstract from ParticleSpewer 2021-09-19 03:19:16 +02:00
Bartłomiej Dach
36237398fa
Remove accidental leftover nullable BDL spec 2021-09-18 18:24:36 +02:00
Bartłomiej Dach
c23354bb67
Remove unused setter 2021-09-18 16:28:44 +02:00
Bartłomiej Dach
59657aca9a
Remove redundant qualifier 2021-09-18 16:28:25 +02:00
Bartłomiej Dach
79438c19a4
Fix slider parts not reproxying after first hitobject freed 2021-09-18 16:27:30 +02:00
smoogipoo
bcbd0e0961 Revert ctor param 2021-09-16 20:06:20 +09:00
smoogipoo
d8f27633a4 Fix legacy approach circles accepting alpha 2021-09-16 19:35:15 +09:00
Dean Herbert
2df4073946 SpawnParticle -> CreateParticle (and set time outside of virtual call)
Allows easier overriding (no need to call the `base.CreateParticle` call
and worry about overwriting the time value.
2021-09-16 16:52:46 +09:00
Dean Herbert
29ce2f05bd Remove implied defaults 2021-09-16 16:44:46 +09:00
Opelkuh
32d65adb35 Fix cursor particle scale 2021-09-15 21:22:37 +02:00
Opelkuh
d13ff12a3e Remove hardcoded particle scale 2021-09-14 00:36:52 +02:00
Opelkuh
c4886be7e1 Add StarBreakAdditive config support 2021-09-14 00:36:01 +02:00
Opelkuh
9fd616c578 Tiny refactor 2021-09-14 00:16:42 +02:00
Opelkuh
224244801f Remove Particles namespace 2021-09-13 21:44:27 +02:00
Opelkuh
16f98357e6 Add cursor particles tests 2021-09-13 21:44:25 +02:00
Opelkuh
82d16ab394 Fix LegacyCursorParticles texture null reference 2021-09-13 21:44:24 +02:00
Opelkuh
a688e69859 Scale down cursor particles 2021-09-13 21:44:24 +02:00
Opelkuh
911282234e Rename legacy cursor particle classes 2021-09-13 21:44:23 +02:00
Opelkuh
8862d3fa1e Add OsuSkinComponents.CursorParticles 2021-09-13 21:44:23 +02:00
Opelkuh
99eff4f41f Move cursor particles under OsuCursorContainer 2021-09-13 21:44:22 +02:00
Opelkuh
c2f7b01ca4 Change particle AngularVelocity into StartAngle and EndAngle 2021-09-13 21:44:21 +02:00
Opelkuh
6d68da8ff0 Remove StartScale from ParticleSpewer particles 2021-09-13 21:44:20 +02:00
Opelkuh
db662f8c5c Add ParticleParent option to ParticleSpewer 2021-09-13 21:44:20 +02:00
Opelkuh
5b1b36436f Add cursor velocity to star particles 2021-09-13 21:44:19 +02:00
Opelkuh
ee4006f3d7 Add legacy cursor star particles 2021-09-13 21:44:18 +02:00
Dean Herbert
738ce0f689 Fix repeat arrows being hidden beneath head circles in legacy skins
Aims to make minimal changes to `DrawableSlider` itself. I'm not super
happy about the slider ball being moved above the head circle, but it
*is* what people are used to so no one except for me is going to
complain.

Supersedes and closes https://github.com/ppy/osu/pull/14561.
2021-09-01 19:41:49 +09:00
Dean Herbert
4f9c3fde07 Move alpha adjustment back to LegacySliderBody to correctly handle default legacy skin 2021-09-01 15:10:56 +09:00
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
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
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
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
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
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
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
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
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
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
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
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