Dean Herbert
c179f0bb52
Fix argon hit circle outer gradient getting smaller each state application
2022-11-01 18:31:30 +09:00
Dean Herbert
995216cced
Merge pull request #20819 from Joppe27/taiko-kiai-flashing
...
Implement taiko hitobject kiai flashing
2022-10-24 15:31:13 +09:00
Bartłomiej Dach
c0709a59f5
Merge branch 'master' into argon-spinner-sides
2022-10-23 18:44:04 +02:00
Dean Herbert
bcd65f3c3c
Merge pull request #20827 from goodtrailer/smoke-uncapped-v3
...
Remove smoke point maximum
2022-10-21 19:58:49 +09:00
Alden Wu
23b7b9013e
Change smoke quadbatch growth factor to 2 from 1.5
2022-10-20 23:37:05 -07:00
Dean Herbert
7dbd6e2469
Merge branch 'master' into taiko-kiai-flashing
2022-10-21 12:48:35 +09:00
Dan Balasescu
e577a87618
Merge pull request #20825 from peppy/fix-argon-editor-combo-colour-change
...
Fix some argon circle layers not getting correct colour updates in editor
2022-10-20 12:56:34 +09:00
Salman Ahmed
7d31eaea54
Move ball tinting logic to overwrite SliderBall colour
2022-10-20 03:55:53 +03:00
Salman Ahmed
eb386d4bd5
Enable slider ball tint in default legacy skin
2022-10-20 03:29:25 +03:00
Salman Ahmed
ba37daa456
Bring back removed newline
2022-10-20 01:18:10 +03:00
Salman Ahmed
1852714d2d
Fix existing alpha transform cleared on accent colour change
...
Clearing it causes its start value to be lost.
2022-10-20 01:16:27 +03:00
Dean Herbert
aca0d04834
Forcefully remove transforms before reapplying to avoid old accent colour getting rewound
2022-10-19 15:52:25 +09:00
Dean Herbert
9356a40a39
Remove redundant flash layer colour logic
...
In a previous iteration, the flash layer was white on the initial hit,
but this seems to have been removed for the final implementation.
2022-10-19 15:13:22 +09:00
Alden Wu
50ab9bff8b
Rename for consistency
2022-10-18 23:05:09 -07:00
Alden Wu
a9b8ba94fa
Add necessary newlines
2022-10-18 22:59:58 -07:00
Alden Wu
343c560b1b
Remove smoke point maximum/cap
2022-10-18 22:54:17 -07:00
Dean Herbert
16c86b0744
Merge pull request #20815 from frenzibyte/remove-hitcircle-fade-easing
...
Remove fade easing from legacy hit circles to match stable
2022-10-19 12:08:45 +09:00
Joppe27
59213fc00b
Update LegacyMainCirclePiece to use renamed version of KiaiFlashingDrawable
2022-10-18 23:53:12 +02:00
Joppe27
a76a039722
Rename KiaiFlashingDrawable and move to osu.Game
2022-10-18 23:40:43 +02:00
Salman Ahmed
3b3f3dc159
Fix new-style spinners fading in later than usual
2022-10-18 23:48:40 +03:00
Salman Ahmed
2245456224
Remove fade easing from legacy hit circles on hit
2022-10-18 22:22:53 +03:00
Salman Ahmed
2adbf4cc1a
Add arc-shaped progress bars to "argon" spinner
2022-10-17 08:58:47 +03:00
Bartłomiej Dach
148da4d423
Merge branch 'master' into argon-judgement-in-front
2022-10-15 22:42:41 +02:00
Alden Wu
46bcabea6c
Separate smoke rotation seed and index
2022-10-14 12:42:04 -07:00
Alden Wu
029f896db8
Use StatelessRNG for smoke rotation
2022-10-13 16:18:47 -07:00
Alden Wu
310588ad94
Renew smoke rng every draw
2022-10-13 13:01:05 -07:00
Dean Herbert
dd372c4d19
Move "argon" skin judgement text in front of hitobjects
2022-10-13 13:52:02 +09:00
Dean Herbert
8bf4ca4b53
Add legacy skin fallback when beatmap skin is providing resources
2022-10-12 17:47:20 +09:00
Dan Balasescu
4e6047f23d
Merge pull request #20571 from peppy/argon-mania
...
Add "argon" key area for osu!mania
2022-10-07 15:19:18 +09:00
Alden Wu
9d54467145
Make smoke skinnable lifetime more robust
2022-10-05 19:13:06 -07:00
Alden Wu
49e023f861
Rename OsuSkinComponents.SmokeTrail to CursorSmoke
2022-10-05 19:11:38 -07:00
Dean Herbert
8f0ef99e10
Privatise some fields
2022-10-05 18:54:14 +09:00
Dean Herbert
bd82dfc333
Remove custom radius implementation
2022-10-05 18:53:07 +09:00
Dean Herbert
91d877e893
Set LifetimeEnd once rather than computing on every access
2022-10-05 18:52:01 +09:00
Dean Herbert
6628ab5190
Refactor to avoid DI / event flow
...
There's always one active smoke segment and it's the direct child of
`SmokeContainer`. This can be simplified as such.
2022-10-05 18:37:14 +09:00
Dean Herbert
1e5ff2679b
Rename classes to better emphasise that Smoke is a single trail segment
2022-10-05 18:29:16 +09:00
Dean Herbert
04abb2ce8f
Update default cursor smoke implementation to use a texture
2022-10-05 18:26:17 +09:00
Dean Herbert
395ab58892
Attempt to fix code style infractions
2022-10-04 16:17:38 +09:00
Alden Wu
b0a948df45
Move LegacySmoke animation implementation to Smoke
2022-10-04 00:17:00 -07:00
Dean Herbert
326a3e6583
Add TODO in osu! argon transformer regarding missing components
2022-10-04 14:56:46 +09:00
Alden Wu
343bdaa98e
Remove unnecessary IsActive variable
2022-10-03 16:07:39 -07:00
Alden Wu
929eb8559e
Fix LegacySmoke alpha calculations
2022-10-03 16:02:33 -07:00
Dean Herbert
0bac5ef465
Merge branch 'master' into smoke
2022-10-03 21:29:42 +09:00
Dean Herbert
965d0603ce
Fix slider tick colour not being applied properly
2022-09-23 21:11:25 +09:00
Dean Herbert
a94b4e402e
Merge branch 'master' into argon-spinner
2022-09-23 14:22:53 +09:00
Salman Ahmed
49af80e17b
Remove 1.3x scale and adjust metrics with it
2022-09-22 20:39:42 +03:00
Salman Ahmed
e9c3478f69
Add very basic "argon" spinner
2022-09-22 20:39:42 +03:00
Dean Herbert
3811ea113d
Adjust argon animations a bit
2022-09-23 00:54:24 +09:00
Dean Herbert
e95758cfcd
Add basic "argon" cursor
2022-09-22 21:21:30 +09:00
Dean Herbert
8875f7ee43
Add very basic follow point implementation for argon skin
...
This is just something to look better than the glowing mess which
triangles fallback was providing. This element hasn't been designed yet,
so I'm just filling in with something amicable for the time being.
2022-09-22 20:24:29 +09:00
Dan Balasescu
a612fe70f9
Merge pull request #20401 from peppy/fix-argon-sprite-lookup
...
Fix "argon" skin not supporting user loaded sprites in gameplay
2022-09-22 19:40:31 +09:00
Dan Balasescu
68e274b92d
Merge pull request #20400 from peppy/fix-argon-reverse-arrow-colour
...
Fix argon reverse arrow becoming white after switching skins
2022-09-22 19:01:19 +09:00
Dean Herbert
74aefdc5bd
Move basic transformer behaviour to base abstract class
2022-09-22 18:53:43 +09:00
Dean Herbert
f8e9a960ba
Fix argon skin not forwarding resource lookups to user backing
2022-09-22 18:53:43 +09:00
Dean Herbert
ea7c5458fe
Fix sprite dropdown not showing resources from non-legacy skins during gameplay
2022-09-22 18:53:43 +09:00
Dean Herbert
68015ef10c
Fix argon reverse arrow becoming white after switching skins
2022-09-22 18:12:28 +09:00
Dean Herbert
0458305a23
Add argon judgement bubbles
2022-09-22 17:50:21 +09:00
Alden Wu
092e6cfa1d
Lock smoke bounds to playfield
2022-09-20 12:03:07 -07:00
Alden Wu
ddbd69dc67
Replace LifetimeAfterSmokeEnd with abstract LifetimeEnd
2022-09-20 09:44:01 -07:00
Dan Balasescu
3ec16063bd
And another invalidate
2022-09-20 21:01:18 +09:00
Dan Balasescu
102c140967
Remove another invalidate
2022-09-20 20:59:58 +09:00
Dan Balasescu
c28ed477e1
Expose less stuff, clean up implementation
2022-09-20 20:54:49 +09:00
Dan Balasescu
ff6e4e3a96
Privatise setters
2022-09-20 20:42:12 +09:00
Dan Balasescu
9f23210e7e
Use British-English
2022-09-20 20:40:20 +09:00
Dan Balasescu
5d3c6efcc5
Dispose quad batch
2022-09-20 20:40:20 +09:00
Dan Balasescu
f7962c993d
Reduce the number of points
2022-09-20 20:40:20 +09:00
Dan Balasescu
5d73de9021
Perform matrix mults on the GPU
2022-09-20 20:40:20 +09:00
Alden Wu
90a05f4bed
Cap smoke on point count + omit invisible vertices
2022-09-20 01:40:20 -07:00
Alden Wu
c3b8e1d718
Fix test and spawn smoke immediately
2022-09-19 10:16:05 -07:00
Alden Wu
0316e3e706
Merge branch 'master' of https://github.com/ppy/osu into smoke
2022-09-19 09:07:17 -07:00
Dean Herbert
c8206b747b
Fix border / slider body metrics
2022-09-19 23:16:46 +09:00
Dean Herbert
4eae5f8733
Add back outer fill for hitcircles (but not slider head circles)
2022-09-19 23:16:46 +09:00
Dean Herbert
edc624c4be
Tweak slider ball fade to be less present after slider ends
2022-09-19 23:16:46 +09:00
Dean Herbert
4f1530c2db
Add slider follow circle
2022-09-19 23:16:46 +09:00
Dean Herbert
3c0983b0db
Add slider reverse arrow
2022-09-19 23:16:46 +09:00
Dean Herbert
d4e2f70f87
Add slider score point
2022-09-19 23:16:46 +09:00
Dean Herbert
ef6ea49b18
Add slider ball
2022-09-19 23:16:46 +09:00
Dean Herbert
cd84503e62
Add slider body
2022-09-19 23:16:46 +09:00
Dean Herbert
403cc59208
Further animation tweaks and better documentation
2022-09-19 23:16:46 +09:00
Dean Herbert
02fbb04ba8
Add basic argon judgement
2022-09-19 23:16:46 +09:00
Dean Herbert
4a86fe1ca9
Tweak main circle animations
2022-09-19 23:16:46 +09:00
Dean Herbert
b766493776
Add basic argon skin transformer for osu! ruleset
2022-09-19 23:16:46 +09:00
Alden Wu
8204090e47
Scale smoke radius based on texture width
2022-09-19 00:07:22 -07:00
Alden Wu
3eb28881e4
Temp default smoke scale/rotation anims
2022-09-18 22:14:54 -07:00
Alden Wu
8474335aea
Remove hacky LifetimeEnd workaround
2022-09-18 22:08:45 -07:00
Alden Wu
a0e31018a1
Copy stable smoke's fade/alpha values, blending, scale, and rotation
2022-09-18 22:06:07 -07:00
Alden Wu
0138663bdc
Fix InspectCode errors
2022-09-18 18:32:33 -07:00
Alden Wu
613564b5b9
Full legacy smoke implementation and temp default smoke
2022-09-18 12:10:01 -07:00
Alden Wu
493efd84a3
Basic smoke path implementation
2022-09-18 12:08:34 -07:00
Dean Herbert
bc1212f4e6
Change NonGameplayAdjustments to GameplayAdjustments and convert TrueGameplayRate to extension method
2022-09-06 22:26:46 +09:00
Dean Herbert
c8764cb333
Move all usage of GameplayClock to IGameplayClock
2022-08-15 18:30:53 +09:00
Dean Herbert
e0940c6c22
Update animations to final versions
2022-08-01 18:03:32 +09:00
Alden Wu
c2c2c505a4
Combine FollowCircle and TickFollowCircle classes
2022-07-21 19:46:46 -07:00
Dean Herbert
726042d9ec
Use switch instead of or
2022-07-21 23:16:28 +09:00
Alden Wu
23fd514ca3
Use DrawableSliderTail instead of DrawableSlider
2022-07-20 18:07:02 -07:00
Alden Wu
5cb0920cfb
Revert OnSliderTail() to OnSliderEnd()
...
In light of the comment added in the previous commit, slider tail
and end are not actually the same.
2022-07-19 02:27:04 -07:00
Alden Wu
e1f7db6e7d
Fix around some comments
2022-07-19 02:25:14 -07:00
Alden Wu
d213f56f79
Align legacy followcircle anims to slider ticks
2022-07-19 02:08:53 -07:00
Dean Herbert
e346624b14
Fix animation changes incorrectly applying to successful completion of sliders
2022-07-19 15:51:02 +09:00
Salman Ahmed
887f2721b0
Merge branch 'master' into default-follow-circle-improvements
2022-07-15 18:39:57 +03: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
afec7941ff
Adjust default follow circle animations to feel nicer
2022-07-15 17:28:42 +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
Dean Herbert
0ade8db550
Tidy up nullability and casting
2022-07-15 16:40:48 +09:00
Alden Wu
1581f1a0ff
Convert constructor in abstract class to protected
2022-07-14 17:11:01 -07:00
Alden Wu
4453b0b3e8
Replace comment pointer with actual comment
2022-07-14 17:11:01 -07:00
Alden Wu
66932f1af6
Move shared followcircle code into abstract base class
2022-07-14 17:11:01 -07:00
Dean Herbert
0bc42ef67d
Merge branch 'master' into stable-slider-followcircle-anims
2022-07-14 00:24:33 +09: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
Salman Ahmed
7f94405c9e
Rename method and make duration optional
2022-07-06 23:38:11 +03:00
goodtrailer
72fb1ae892
Add forgotten unsubscribes
2022-07-05 21:04:13 -07:00
goodtrailer
1e6def8209
Fix spinner accent animation on rewind
2022-07-04 22:58:41 -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
8cda55e224
Merge pull request #18795 from smoogipoo/full-size-follow-circle
...
Track the full size of the follow circle at all times
2022-06-28 19:20:34 +09:00
Dean Herbert
31a447fda0
Update parameter discards
2022-06-24 21:26:19 +09:00
Dan Balasescu
ede5ca31a1
Always track final follow circle size
2022-06-21 18:10:11 +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
Dean Herbert
c4854d4004
Fix slider ball rotation becoming undefined when time is not flowing smoothly
2022-05-12 17:55:12 +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
Dean Herbert
a1b7bf3986
Use a minimum fade length for clamping rather than zero
...
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2022-03-10 16:47:02 +09:00
Siim Pender
a02adfdbd4
Fix crash on super high bpm kiai sections
2022-03-07 20:36:09 +02:00
Susko3
19467e58c1
Remove unused params from BDL methods
2022-01-15 01:06:39 +01:00
Joseph Madamba
b245ffefc1
Merge remote-tracking branch 'upstream/master' into fix-remaining-identifier-names
2022-01-12 15:05:07 -08: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
Joseph Madamba
c22a07d9fc
Bump identifier typo inspection and fix remaining identifier names
2021-12-28 11:26:42 -08: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
