355 Commits

Author SHA1 Message Date
Harald Csaszar
1a431045c6 [unity] Fixed new atlas format import after atlas format changes (see commit f8d6359). Replaced hardcoded first pass of dual-pass atlas loading with proper Atlas method calls. 2020-12-21 19:16:09 +01:00
Nathan Sweet
f8d6359b32 [csharp][unity] Updated TextureAtlas parsing for latest format. 2020-12-20 15:26:05 -08:00
badlogic
19bc4d4413 Merge branch '3.8' into 4.0-beta 2020-12-10 16:09:26 +01:00
Harald Csaszar
2fde05e899 [unity] Fixed URP and LWRP Sprite shader ramp only respecting main directional light, see #1819. Addition: All Sprite shaders now provide four Diffuse Ramp modes as an Inspector Material parameter: Hard, Soft, Old Hard and Old Soft. 2020-12-09 19:01:03 +01:00
Harald Csaszar
473caafd00 [unity] Fixed SRP batching support at Sprite shader of URP and LWRP shaders, with enabled rim light they were not compatible. See #1813. 2020-12-09 13:39:24 +01:00
badlogic
279fb3fca9 Merge branch '3.8' into 4.0-beta 2020-12-05 10:06:38 +01:00
Harald Csaszar
16b95b971b [unity] Now all URP and LWRP shaders support SRP batching. Closes #1813. 2020-12-02 20:23:31 +01:00
badlogic
ae6eda01f7 Merge branch '3.8' into 4.0-beta
# Conflicts:
#	spine-ts/build/spine-all.js.map
#	spine-ts/build/spine-canvas.js.map
#	spine-ts/build/spine-core.js.map
#	spine-ts/build/spine-player.js.map
#	spine-ts/build/spine-threejs.js.map
#	spine-ts/build/spine-webgl.js.map
#	spine-ts/canvas/example/assets/spineboy-ess.json
#	spine-ts/canvas/example/assets/spineboy.png
#	spine-ts/player/example/assets/raptor-pma.png
#	spine-ts/player/example/assets/raptor-pro.json
#	spine-ts/player/example/assets/spineboy-pma.png
#	spine-ts/player/example/assets/spineboy-pro.skel
#	spine-ts/threejs/example/assets/raptor-pro.json
#	spine-ts/threejs/example/assets/raptor.png
#	spine-ts/webgl/example/assets/coin-pro.skel
#	spine-ts/webgl/example/assets/goblins-pro.skel
#	spine-ts/webgl/example/assets/mix-and-match-pma.atlas
#	spine-ts/webgl/example/assets/mix-and-match-pma.png
#	spine-ts/webgl/example/assets/mix-and-match-pro.skel
#	spine-ts/webgl/example/assets/owl-pma.png
#	spine-ts/webgl/example/assets/owl-pro.skel
#	spine-ts/webgl/example/assets/raptor-pma.png
#	spine-ts/webgl/example/assets/raptor-pro.skel
#	spine-ts/webgl/example/assets/spineboy-pma.png
#	spine-ts/webgl/example/assets/spineboy-pro.skel
#	spine-ts/webgl/example/assets/spineboy.png
#	spine-ts/webgl/example/assets/stretchyman-pro.skel
#	spine-ts/webgl/example/assets/tank-pma.atlas
#	spine-ts/webgl/example/assets/tank-pma.png
#	spine-ts/webgl/example/assets/tank-pro.skel
#	spine-ts/webgl/example/assets/vine-pro.skel
2020-11-27 18:47:44 +01:00
Harald Csaszar
3151c18b6c [unity] SkeletonRenderer components now provide an additional update mode Only Event Timelines at the Update When Invisible property. Added methods to AnimationState for proper behaviour during transitions. Closes #1815. 2020-11-27 14:03:41 +01:00
Harald Csaszar
23bce387af [unity] Added problematic component/material combination check for Canvas Group Tint Black when not using a SkeletonGraphic Tint Black shader. See #1812. 2020-11-24 20:14:03 +01:00
Harald Csaszar
1d59409bde Merge branch '3.8' into 4.0-beta 2020-11-24 18:02:22 +01:00
Harald Csaszar
068a624608 [unity] Fixed regression of SkeletonMecanim not handling negative values at a State's Speed property. Now both Speed and Multiplier are respected. Closes #1810. 2020-11-20 21:24:02 +01:00
Harald Csaszar
bf4df3b5f3 Merge branch '3.8' into 4.0-beta 2020-11-16 21:31:57 +01:00
Harald Csaszar
6d83190946 [unity] Added null checks at BoundingBoxFollower classes to handle SkeletonData not being assigned. 2020-11-16 13:00:31 +01:00
Harald Csaszar
f1af1d5bf1 [unity] GetRemappedClone() method now provides an additional parameter pivotShiftsMeshUVCoords for MeshAttachments to prevent uv shifts at a non-central Sprite pivot. Closes #1809. 2020-11-13 19:12:05 +01:00
Harald Csaszar
97cf4a9294 Merge branch '3.8' into 4.0-beta 2020-11-11 16:06:57 +01:00
Harald Csaszar
d0681d7929 [unity] Previous commit 75b9321 was missing two added files. Added BoundingBoxFollowerGraphic component. [..] See #1770. 2020-11-10 16:45:09 +01:00
Harald Csaszar
75b932173d [unity] Added BoundingBoxFollowerGraphic component. Added Inspector context menu functions Add all BoundingBoxFollower GameObjects for SkeletonRenderer and SkeletonGraphic. Closes #1770. 2020-11-10 16:37:48 +01:00
badlogic
81aee82c91 Merge branch '3.8' into 4.0-beta 2020-10-29 15:43:48 +01:00
Harald Csaszar
b62c531487 [unity] Now failing more gracefully when loading of binary skeleton data fails. Fixed memory leak when loading incompatible binary skeleton asset. Closes #1799. See #1497. 2020-10-28 19:33:13 +01:00
Harald Csaszar
88f403f5fc [unity] RectMask2D no longer ignored by SkeletonGraphic with Multiple CanvasRenderers option enabled. Fixes #1802. 2020-10-28 14:59:43 +01:00
badlogic
ee3f088e6c Merge branch '3.8' into 4.0-beta 2020-10-23 11:26:34 +02:00
Harald Csaszar
d2529d410b [csharp] Porting of major 4.0-beta runtime changes. Remaining Unity assets will be updated in separate commit. See #1796. 2020-10-22 14:44:13 +02:00
Harald Csaszar
239de24002 [unity] Fixed compile error in LWRP shaders due to incorrect include path. Closes #1793. 2020-10-21 14:48:43 +02:00
Harald Csaszar
d4654588fb [unity] Fixed animation not playing first time entering play mode after compilation. Related to disabled Domain/Scene reload. See #1621. 2020-10-19 18:46:07 +02:00
Harald Csaszar
17e8373e47 [unity] Fixed SkeletonMecanim handling negative NormalizedTime incorrectly. Closes #1790. 2020-10-19 17:13:34 +02:00
Harald Csaszar
90486705f6 [unity] Now providing BeforeApply update callbacks at all skeleton animation components. Closes #1783. 2020-10-14 12:17:01 +02:00
Harald Csaszar
c3bfac7edd [unity] Fixed a compile error on older .NET versions, introduced by last commit 75efe44. See #1765. 2020-10-07 20:33:51 +02:00
Harald Csaszar
75efe44fab [unity] Detecting and reporting more incorrect shader/component configurations via Inspector warning boxes and log output. Closes #1765. 2020-10-07 20:23:52 +02:00
Harald Csaszar
9bfe314aeb [unity] Fixed false warning issued on URP 2D shaders. Closes #1767. 2020-09-30 19:57:02 +02:00
Harald Csaszar
5c1faa85af [unity] Fixed all Tint and TintBlack shader blend behaviour, previous changes by commit d43b7b0 were incorrect in some cases. Closes #1756. 2020-09-29 16:38:37 +02:00
Harald Csaszar
d43b7b0a9f [unity] Fixed enabling CanvasGroup Compatible at Spine-SkeletonGraphic-TintBlack shader causing Additive blend mode not to work but instead hide the attachment completely. Now providing a Canvas Group Tint Black parameter a SkeletonGraphic Inspector in the Advanced section. Closes #1756. 2020-09-11 20:38:14 +02:00
Harald Csaszar
4cf792f51d [Unity] Fixed incorrect color calculations at TintBlack shaders, TintBlack color was applied incorrectly leading to lighter borders at semitransparent borders. Fixed additive blend mode at SkeletonGraphic-TintBlack. Closes #1747. 2020-09-11 18:38:03 +02:00
Harald Csaszar
faf9bbfe87 [unity] Removed redundant [SerializeField] attributes at public members. Closes #1757. 2020-09-10 18:06:26 +02:00
Harald Csaszar
24e17bfeea [unity] Fixed SkeletonMecanim MixModes being incorrectly initialized (AlwaysMix vs MixNext) when Custom MixMode is enabled and the Component was just created/reset or new Mecanim layers were added. 2020-09-02 20:14:02 +02:00
Harald Csaszar
7011a462db [unity] Added root motion scale parameters. Added SkeletonRootMotion.AdjustRootMotionToDistance() and more for delta compensation (to e.g. stretch a jump to a given distance). Closes #1754. 2020-09-02 19:48:28 +02:00
Harald Csaszar
9667bd2293 [unity] Added OnMeshAndMaterialsUpdated callback for SkeletonRenderSeparator and SkeletonPartsRenderer. Closes #1752. 2020-09-01 16:51:02 +02:00
Harald Csaszar
cccd2132bf [unity] Added/updated HelpUrl of Spine components, now pointing to proper sections of online spine-unity doc. 2020-09-01 16:25:23 +02:00
Harald Csaszar
30ce32519f [unity] Added outline-only shader Spine/Outline/OutlineOnly-ZWrite respecting overlapping attachments. Renders in two passes. Closes #1751. 2020-08-31 19:34:40 +02:00
Harald Csaszar
8476b55fee [unity] Enabled CanvasGroup support by default for all SkeletonGraphic shaders on 4.0 branch. See commit 9d46a0c8bf. See #1576. 2020-08-14 17:47:15 +02:00
Nathan Sweet
896e6a419c Merge branch '3.8' into 4.0-beta 2020-08-10 23:56:47 +02:00
Nathan Sweet
33e2aea7ff Merge branch '3.8' into 4.0-beta 2020-08-10 23:53:10 +02:00
Harald Csaszar
978b305717 [unity] Added frustum culling / update mode parameters Update When Invisible and UpdateMode to all Skeleton components. Closes #1595. 2020-08-05 19:24:49 +02:00
Harald Csaszar
3c94f52b52 [unity] Added support for double-sided lighting at SkeletonLit shaders (including URP and LWRP packages). Closes #1730. 2020-07-30 12:13:52 +02:00
Harald Csaszar
0e2ced5042 [unity] PointFollower and BoundingBoxFollower now correctly unsubscribe from events on deletion / disable. Closes #1729. 2020-07-29 11:53:32 +02:00
Harald Csaszar
3be202711c [unity] Added a warning box when URP Sprite shader is improperly configured for receiving shadows ('Add Normals' needs to be enabled). Closes #1726. 2020-07-24 14:25:41 +02:00
Harald Csaszar
844d13d1ef [unity] Fixed a warning occurring in newer Unity versions, two static extension method classes named SkeletonExtensions in different namespaces but the same file. 2020-07-14 17:03:38 +02:00
Harald Csaszar
84443288b5 [unity] Fixed exception when new Unity 2019.3 Enter Play Mode has disabled domain reload. Closes #1621. 2020-07-10 18:37:36 +02:00
Harald Csaszar
8a444681d2 [unity] SkeletonMecanim now provides additional parameter Custom MixMode which can be disabled to use recommended MixMode settings. By default the parameter is enabled to maintain current 3.8 behaviour. 2020-07-10 14:46:06 +02:00
Harald Csaszar
7626f3b58a [unity] Fixed SkeletonMecanim blend result weights at mode MixNext, no longer bahaving unexpectedly. At additive layers, MixMode.MixNext is always set to MixMode.AlwaysMix since MixNext makes no sense there. Closes #1718. 2020-07-08 20:05:47 +02:00