Dean Herbert
ad4e988520
Adjust reverse arrows to bounce more
2023-10-02 18:43:50 +09:00
Dean Herbert
455fc228ad
Add edge piece to argon reverse arrow
2023-10-02 18:43:50 +09:00
Dean Herbert
7dd9951c44
Split out reverse arrow implementations to allow better animation
2023-10-02 18:43:50 +09:00
Dean Herbert
990c54519b
Merge branch 'master' into limit-gameplay-sprite-dimensions
2023-09-26 16:40:32 +09:00
Dean Herbert
8e16b1d507
Simplify some maximum size specs
2023-09-20 12:48:15 +09:00
Salman Ahmed
922f6f36f2
Add size limitation for hit object numbers
2023-09-19 04:38:10 +03:00
Salman Ahmed
ab5226832a
Add size limitation for slider reverse arrow piece
2023-09-19 04:38:10 +03:00
Salman Ahmed
b823507b2a
Add size limitation for approach circles
2023-09-19 04:38:10 +03:00
Salman Ahmed
f963a921db
Add size limitation for slider follow circle
2023-09-19 04:18:12 +03:00
Salman Ahmed
fc1a39ede3
Add size limitations for slider balls
2023-09-19 04:18:12 +03:00
Salman Ahmed
291a91be66
Change extension from retrieval to post-processing instead
2023-09-19 03:40:30 +03:00
Salman Ahmed
57dc76b345
Revert "Update GetTexture signature rather than creating new overload"
...
This reverts commit 96f12cfbaa
2023-09-19 03:21:19 +03:00
Dean Herbert
e3e7a81ad9
Remove slider head circle movement (and remove setting from "classic" mod)
2023-09-14 17:49:41 +09:00
Dean Herbert
96f12cfbaa
Update GetTexture signature rather than creating new overload
2023-09-05 18:01:19 +09:00
Salman Ahmed
351081eb27
Add limit to osu! hit circle elements
2023-09-03 02:22:53 +03:00
Dean Herbert
0858bef66e
Update SmokeSegment in line with framework vertex changes
2023-08-17 18:12:04 +09:00
Dean Herbert
2e9379474d
Change spinner rotation animation to match input 1:1
2023-07-25 19:21:20 +09:00
Dean Herbert
bddb91dc0a
Adjust adjustment to 1px based on review feedback
...
Also split out `Size` variable for clarity
2023-06-12 14:24:39 +09:00
Dean Herbert
03a5b701e9
Fix incorrect inline comment
...
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2023-06-12 14:20:54 +09:00
Dan Balasescu
4b8c4bd503
Fix black jaggies around argon hitcircles
2023-06-10 01:54:13 +09:00
Dean Herbert
9c4312b407
Add support for flipping colour of reverse arrow on legacy default skin when combo colour is too bright
2023-05-03 12:37:07 +09:00
Dean Herbert
bd72c67d68
Increase the rate of slider ball fade on argon skins to match other implementations
2023-05-02 15:47:35 +09:00
Dean Herbert
72b472a756
Change default scaling and add note about legacy cursor-ripple scale
2023-04-30 14:48:03 +09:00
Dean Herbert
a4ae9e409b
Implement ripples (legacy and default)
2023-04-30 14:48:03 +09:00
Dean Herbert
b39a9d816e
Add basic structural requirements for cursor ripples
2023-04-30 14:48:03 +09:00
Salman Ahmed
678e8ed736
Update UBO usages inline with framework changes
2023-03-16 14:06:35 +03:00
Bartłomiej Dach
a14481acca
Merge pull request #22440 from peppy/argon-hit-lighting-v2
...
Adjust argon hit lighting further
2023-01-30 19:34:58 +01:00
Dean Herbert
2b55e05b10
Adjust argon hit lighting further
2023-01-27 13:31:21 +09:00
Dean Herbert
de1d473d29
Fix kiai flash being visible and incorrectly sized during hit animation
2023-01-26 15:24:10 +09:00
Bartłomiej Dach
73f53328cf
Merge branch 'master' into argon-kiai
2023-01-25 22:21:26 +01:00
Bartłomiej Dach
3daa9e6295
Merge branch 'master' into argon-hit-lighting-peppy-take
2023-01-25 21:44:43 +01:00
Dean Herbert
48d68b0f4f
Add very basic kiai flash to argon hit circles
2023-01-25 18:59:26 +09:00
Dean Herbert
9499d3a20a
Add support for disabling "hit lighting" with osu! argon skin
2023-01-25 15:50:49 +09:00
Dean Herbert
d8365f4fca
Reverse order of application to match DrawableHitObject
2023-01-25 11:47:15 +09:00
Dean Herbert
3a47be6e00
Fix argon hit circles occasionally going missing during editor seeking
2023-01-24 17:43:14 +09:00
Bartłomiej Dach
7483967157
Merge branch 'master' into SliderEnd-Snap
2023-01-23 21:33:16 +01:00
ekrctb
7e466e1eba
Fix SPM calculation division by zero
2023-01-20 21:00:01 +09:00
Wleter
00f15d19f9
fix double newlines
2023-01-17 21:11:21 +01:00
Dean Herbert
e9571be4ab
Fix incorrect application layer causing completely discoloured circles
2023-01-11 19:29:17 +09:00
Dean Herbert
0d1046ed83
Add full colour application to kiai sprites
2023-01-11 19:29:17 +09:00
Wleter
98ffcd33c7
Merge branch 'ppy:master' into SliderEnd-Snap
2023-01-10 21:22:13 +01:00
Wleter
38bb7ac0c7
add fields for path's end location
2023-01-10 21:16:34 +01:00
Salman Ahmed
760b2d98df
Tint "argon" slider follow circle with combo colour
2023-01-04 16:19:30 +03:00
Salman Ahmed
d70df08f45
Tint "argon" slider ball with combo colour
2023-01-04 16:19:16 +03:00
Dean Herbert
5e9fb1063a
Move judgement text creation to base class and tidy things up
2022-12-24 12:22:36 +08:00
Dean Herbert
03603f8b54
Don't show great or higher judgements when using argon "pro" skin
2022-12-24 03:35:44 +08:00
Dean Herbert
727ac00f6d
Combine base class for JudgementPiece
2022-12-24 03:32:13 +08:00
Dan Balasescu
7bc8908ca9
Partial everything
2022-11-27 00:00:27 +09:00
Alden Wu
815cd56f13
Add support for nonsquare smoke textures
2022-11-20 16:50:15 -08:00
Thomas Müller-Höhne
9ef43ebd83
Fix compilation after framework-side PR updates
2022-11-12 21:24:12 +09:00
Thomas Müller-Höhne
fa8e38d9d6
Target rounded fragment shader
...
Compatibility with osu-framework change https://github.com/ppy/osu-framework/pull/5512
2022-11-12 17:18:23 +09:00
Dean Herbert
e19ba65f91
Remove LookupName from base ISkinComponentLookup
2022-11-09 17:46:43 +09:00
Dean Herbert
1aa0e40f2f
Add "Component" prefix to lookup naming
2022-11-09 17:46:43 +09:00
Dean Herbert
c908969d9b
Rename ISkinComponent to ISkinLookup
2022-11-09 17:46:43 +09:00
Dean Herbert
82ff142b1b
Apply nullability to osu! skinning classes
2022-11-09 13:37:09 +09:00
Dean Herbert
5e7dc34d05
Move some non-default skin files to correct namespace
2022-11-09 13:31:52 +09:00
Dean Herbert
710c224de4
Remove unused IHasMainCirclePiece interface
2022-11-09 13:31:50 +09:00
Dean Herbert
e89d3840fc
Adjust completion animation
2022-11-03 15:12:30 +09:00
Dean Herbert
0868c00ee8
Fix spinner centre size being updated every frame using transforms
2022-11-03 14:36:16 +09:00
Dean Herbert
62660ec92f
Reorganise drawables and transforms to make more sequential sense
2022-11-03 14:21:22 +09:00
Dean Herbert
304f6f0418
Merge branch 'master' into argon-spinner-sides
2022-11-03 13:21:22 +09:00
Dan Balasescu
947e6d41c0
Merge pull request #21056 from peppy/fix-argon-explosion-size
...
Fix argon hit circle outer gradient getting smaller each state application
2022-11-01 20:03:22 +09:00
Dean Herbert
ff60eebe21
Fix large transform retention when adjusting accent colour of hitobject during pause
2022-11-01 19:12:59 +09:00
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
