h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 20:38:33 +08:00
Code Issues Releases Wiki Activity
51,613 Commits 3 Branches 654 Tags 363 MiB
d7aed77340
Commit Graph

315 Commits

Author SHA1 Message Date
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
Salman Ahmed
99a68e880a Merge remote-tracking branch 'upstream/master' into catch-combo-counter 2020-09-01 20:46:38 +03:00
Salman Ahmed
a0a4501008 Merge remote-tracking branch 'upstream/master' into catch-combo-counter 2020-09-01 20:17:25 +03:00
Bartłomiej Dach
3ab32a5d35 Change structure of old style spinner to be closer to stable 2020-08-29 23:29:29 +02:00
smoogipoo
ab8d9be095 Move out into a separate method 2020-08-25 15:16:41 +09:00
smoogipoo
08078b9513 Rename method to remove "InitialColour" namings 2020-08-22 00:56:29 +09:00
smoogipoo
16a2ab9dea Update osu with legacy colour setters 2020-08-22 00:20:33 +09:00
Salman Ahmed
deb5cc752b Merge remote-tracking branch 'upstream/master' into catch-combo-counter 2020-08-19 08:39:58 +03:00
Salman Ahmed
422100192c Move HasFont to legacy skin extensions class instead 2020-08-19 07:58:23 +03:00
Ron B
61de3c7540
Replace accidental tab with spaces 2020-08-15 20:18:56 +03:00
Ron B
896a87e629
Replace accidental tab with spaces 2020-08-15 20:14:36 +03:00
Ron B
5c11270b98
Add SpinnerFrequencyModulate skin config option 2020-08-15 20:12:06 +03:00
Dean Herbert
662281d727 Adjust legacy spinners to fade in later 
Matches stable 1:1 for legacy skins. I've left lazer default as it is
because changing to use the shorter apperance looks bad. This will
probably change as we proceed with the redesign of the default skin.
 2020-08-13 18:20:46 +09:00
smoogipoo
bce3f3952f Split out variable declaration 2020-08-07 16:36:40 +09:00
Salman Ahmed
9465e7abe1 Rename sprites container to "circleSprites" 2020-08-05 23:45:00 +03:00
Salman Ahmed
43161697f8 Fix wrong english 2020-08-05 23:42:05 +03:00
Salman Ahmed
1ab6110c05 Apply fade out to the number piece with quarter the pieces duration 2020-08-05 20:07:26 +03:00
Salman Ahmed
84f6b7608c Remove misleading ExpandNumberPiece lookup 2020-08-05 20:05:53 +03:00
Salman Ahmed
2771c95bec Merge remote-tracking branch 'upstream/master' into expand-number-piece-on-old-skins 2020-08-04 22:17:54 +03:00
Salman Ahmed
29053048ff Add support to use legacy combo fonts for the counter on legacy skins 2020-08-03 21:40:20 +03:00
Dean Herbert
9e244be489
Use better conditional for choosing which spinner type to use 
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
 2020-08-01 00:05:04 +09:00
Dean Herbert
186b452331 Apply common multiplication refactor 2020-07-31 14:48:56 +09:00
Dean Herbert
19fb350cd8 Move offset and scale to constant 2020-07-30 12:51:05 +09:00
Dean Herbert
743d165319 Add old style spin metre 2020-07-30 12:32:19 +09:00
Dean Herbert
d2b3fe1e7b Add scale to old legacy spinner 2020-07-30 12:08:04 +09:00
Dean Herbert
4d822742e8 Add scale and tint to new legacy style spinner 2020-07-30 12:05:19 +09:00
Dean Herbert
ca21f038e0 Add xmldoc for legacy classes 2020-07-30 10:35:48 +09:00
Dean Herbert
2b71ffa2ed Add back legacy implementations 2020-07-29 22:32:21 +09:00
Dean Herbert
1c00cf95d5 Add initial support for spinner middle skinning 2020-07-29 16:55:47 +09:00
Dean Herbert
e98154b432 Add initial support for spinner background layer 2020-07-29 16:37:32 +09:00
Dean Herbert
d01d1ce3f1 Add initial support for spinner disc skinning 2020-07-29 16:25:10 +09:00
Salman Ahmed
5e7237bf56 Fix incorrect default hitcircle font overlapping applied to legacy skins 2020-07-27 10:29:16 +03:00
Dean Herbert
53a9ac3c1a Fix slider ball rotation being applied to follow circle and specular layer 2020-07-22 19:06:39 +09:00
Bartłomiej Dach
ad85c5f538 Add base legacy skin transformer 2020-06-21 23:06:55 +02:00
Dean Herbert
a4b4b7df21 Fix follow points not starting at correct time 2020-04-06 13:04:46 +09:00
Dean Herbert
bc6c6228ac Tidy up a touch 2020-04-05 14:13:06 +09:00
Endrik Tombak
36ad1cbd79 Format the code 2020-04-04 23:17:55 +03:00
Endrik
634a8f9ff4
Return inline 2020-04-04 23:05:10 +03:00
Endrik Tombak
e1a67bdb96 Move implementation to transformer 2020-04-04 11:13:25 +03:00
Endrik Tombak
d73c791a10 Support this typo for old skins 2020-04-03 20:56:52 +03:00
Dean Herbert
a3d4212462 Fix weird slider ball sizing 2020-04-02 19:56:33 +09:00
Andrei Zavatski
9890544b36 Move implementation to better place 2020-03-30 13:42:18 +03:00
Andrei Zavatski
f96229c572 Add support for HitCircleOverlayAboveNumber legacy skin property 2020-03-30 13:21:22 +03:00
Dean Herbert
fb4b334ce2 Add support for legacy skin sliderstartcircle / sliderstartcircleoverlay 2020-03-28 14:10:26 +09:00
Dean Herbert
900882610d
Merge branch 'master' into expand-number-piece-on-old-skins 2020-03-02 16:40:59 +09:00
Dean Herbert
544685be48 Add support for reading skin frame rate from configuration file 2020-02-07 14:58:29 +09:00
smoogipoo
91735ff367 Update MathUtils namespace usages 2020-01-09 13:43:44 +09:00
mcendu
4b3cfe3bae
temporarily remove kiai flash for legacy circles 2019-12-22 20:01:58 +08:00
mcendu
76a895f348
improve code quality 2019-12-21 22:44:52 +08:00
mcendu
e4eccb86ba
Add property Intensity 2019-12-21 20:53:02 +08:00
mcendu
7bb984eb8d
Basic kiai flash implementation 2019-12-21 20:47:34 +08:00
Salman Ahmed
121ce2c3df Fix checking for expand incorrectly 2019-12-19 14:44:52 +03:00
Dean Herbert
826b271371 Use exact ratio of legacy to default object size 2019-12-18 15:39:36 +09:00
smoogipoo
1fe0e45a9c Implement legacy slider border shadow 2019-12-18 13:37:37 +09:00
Salman Ahmed
41ca084fa5 Simplify expand number check 2019-12-17 22:00:21 +03:00
smoogipoo
2d85145eec Make legacy accent colour multiplicative 2019-12-17 19:52:33 +09:00
smoogipoo
7c2884700e Fix various display issues by abstracting further 2019-12-17 19:29:27 +09:00
smoogipoo
9caed9e98a Add legacy slider body support 2019-12-17 18:16:25 +09:00
mcendu
489d9dc7b5 Switch Expandtarget and "cursormiddle" 2019-12-14 18:33:56 +08:00
Salman Ahmed
d6fb228338 Update version retrieval logic in-line with new implementation 2019-12-12 16:02:53 +03:00
mcendu
dbe46c6cf7
conform to coding styles 2019-12-10 20:40:10 +08:00
mcendu
06cde2b0c2
remove unused using directive 2019-12-10 19:30:46 +08:00
mcendu
22f2a4bed2
Fix LegacyCursor's cursormiddle expanding 2019-12-09 17:53:16 +08:00
smoogipoo
aff1b93a07 Move config retrieval into LegacySliderBall 2019-12-09 14:43:23 +09:00
mcendu
76aabdd297 rename field rotate to spin 2019-12-09 12:11:04 +08:00
mcendu
eb065286ae fix ci 2019-12-09 08:49:44 +08:00
mcendu
1cf81c4906 rm unnecessary curlies 2019-12-09 08:37:32 +08:00
mcendu
b2b252a1cc Allow skin to disable spin 2019-12-09 08:36:07 +08:00
mcendu
4cd0dd7856 Move transformation to LoadComplete 2019-12-08 20:47:28 +08:00
mcendu
13b891f3f4 Crude legacy cursor rotation support 2019-12-08 20:05:02 +08:00
Dean Herbert
f958485be1 Add comment about size change 2019-12-06 18:54:54 +09:00
Dean Herbert
af2305bb77 Add null check 2019-12-06 18:53:30 +09:00
Dean Herbert
21ceb7f85d Always display skins at native sizes for now 2019-12-06 14:40:45 +09:00
iiSaLMaN
9dcbef49d3 Resolve DHO inside load() 2019-10-15 22:28:50 +03:00
iiSaLMaN
2d7acef080 Fix CI issues 2019-10-03 11:06:38 +03:00
iiSaLMaN
dabc224030 Fix hit circle positioning 2019-10-03 06:49:32 +03:00
iiSaLMaN
3fe5611700 Retrieve numeric version value from legacy configuration 2019-10-03 06:48:59 +03:00
iiSaLMaN
957bbee3e4 Scale pieces individually and use skin source directly 2019-10-03 05:58:20 +03:00
iiSaLMaN
5aa85968c2 Expand number piece for old skins in legacy circle pieces 2019-10-01 08:23:41 +03:00
iiSaLMaN
812d33f850 Add ExpandNumberPiece configuration with OsuLegacySkinTransformer 2019-10-01 08:09:01 +03:00
smoogipoo
3155a90501 Use bindables for displayed circle piece numbers 2019-09-26 16:58:20 +09:00
iiSaLMaN
8fcfd82316 Add AllowSliderBallTint to skin configuration 2019-09-20 00:10:55 +03:00
Dean Herbert
96efc91b51 Fix follow points not displaying on some skins 2019-09-11 14:57:42 +09:00
Dean Herbert
aea1ab7fee
Merge branch 'master' into skinned-cursortrail-2 2019-09-11 14:11:52 +09:00
Dean Herbert
6760e239a1 Fix osu! hitcircle font textures being incorrectly sized 2019-09-11 13:39:21 +09:00
smoogipoo
70d39e9be4 Always apply stable's magic ratio 2019-09-11 13:28:36 +09:00
Dean Herbert
36d3736e1d Fix hitcircle font prefix not being read for legacy skins 2019-09-10 18:06:24 +09:00
smoogipoo
a200485fbd Implement disjoint (old style) cursor trails 2019-09-09 19:23:02 +09:00
smoogipoo
55afcc1e04 Add skin component for the legacy cursor trail 2019-09-09 17:53:51 +09:00
smoogipoo
bda21998c4 Add helper method to make direct casts be used 2019-09-05 16:48:56 +09:00
Dean Herbert
bebc3309ce Refactor skin configuration to be infinitely extensible 2019-09-03 17:57:34 +09:00
Dean Herbert
09097f7680
Merge branch 'master' into iskincomponent 2019-09-02 22:38:57 +09:00
Dean Herbert
f9fcf1562f Merge remote-tracking branch 'upstream/master' into iskincomponent 2019-09-02 14:21:02 +09:00
Dean Herbert
2bd074883a Fix OsuLegacySkin fallback logic being incorrect 
Fixes skin fonts not being applied. This is a temporary fix as configuration retrieval from skins will see a complete rewrite over the coming days.
 2019-09-02 12:36:08 +09:00
Dean Herbert
ee4869647f
Merge pull request #5910 from peppy/fix-legacy-skin-text 
Fix legacy skin text reading from the wrong source
 2019-08-31 21:51:26 +09:00
Dean Herbert
3da5eb6c8b Add source lookups for safety 2019-08-31 16:56:32 +09:00
Dean Herbert
2988624f1f Add fallback for safety 2019-08-31 16:52:41 +09:00
Dean Herbert
f89981e1a3 Fix legacy skin text reading from the wrong source 
Regressed with ruleset legacy skin implementation.
 2019-08-31 12:23:15 +09:00
Dean Herbert
a15828ab25 Introduce the concept of SkinComponents 
Removes reliance on string lookups and better defines elements for introduction into database
 2019-08-30 14:55:52 +09:00
Dean Herbert
8f9fe99237 Move SliderFollowCircle implementation 2019-08-30 14:40:36 +09:00
Dean Herbert
22e3ad8b9c Add skinning support to cursor test 2019-08-30 14:09:17 +09:00
Dean Herbert
c389a5c798 Move remaining osu-specific implementations to OsuLegacySkin 2019-08-30 13:42:29 +09:00
Dean Herbert
84e4748268 Remove duplicate getAnimation function and improve namespacing 2019-08-30 12:59:58 +09:00