1620 Commits

Author SHA1 Message Date
Harald Csaszar
e5c47852cc Merge branch '3.8' into 4.0-beta 2021-02-03 22:29:39 +01:00
Harald Csaszar
511c05a3c7 [unity] Fixed SkeletonAnimation Inspector code causing incorrect animation playback. Closes #1841. 2021-02-03 22:28:28 +01:00
Harald Csaszar
8908cdd15c [unity] URP Sprite shader now allows Receive Shadow option when Write to Depth is disabled. This option has been greyed out unnecessarily. Closes #1839. 2021-02-03 18:25:27 +01:00
Harald Csaszar
df9776addf Merge branch '3.8' into 4.0-beta 2021-01-29 13:10:53 +01:00
Harald Csaszar
48470a4b16 [unity] Fixed two minor reported issues (could not be reproduced by user). Now officially supporting Unity versions 2020.1 and 2020.2 with this commit. Closes #1835. 2021-01-29 13:07:22 +01:00
Harald Csaszar
3a437b79b0 [unity] Minor cosmetic change: moved Spine Preferences window Additive Material line up to maintain same order as in SkeletonDataAsset. 2021-01-22 16:55:07 +01:00
Harald Csaszar
6d6de76cda [unity] Upgrade of BlendModeMaterialAssets is performed for all Unity versions in spine-unity 4.0 an newer. See commit 752e72e, see #1822, see #1559. 2021-01-22 11:18:43 +01:00
Harald Csaszar
6e2e46e198 Merge branch '3.8' into 4.0-beta 2021-01-22 11:11:20 +01:00
Harald Csaszar
752e72eb8f [unity] Added native support for slot blend modes Additive, Multiply and Screen with automatic assignment at newly imported skeleton assets. Added upgrade functionality. Closes #1822, closes #1559. 2021-01-22 11:05:41 +01:00
Harald Csaszar
dbb10f36f6 Merge branch '3.8' into 4.0-beta 2021-01-21 14:54:00 +01:00
Harald Csaszar
110581abea [unity] Changing AnimationName in the SkeletonAnimation Inspector now updates every time. Now also repaints GameView accordingly, for both animation and skin changes. Closes #1832. 2021-01-21 13:07:02 +01:00
Harald Csaszar
60b52cb36a [unity] Fixed SkeletonRagdoll and SkeletonRagdoll2D behaving incorrectly when any Transforms are scaled. Closes #1831. 2021-01-19 18:14:52 +01:00
Harald Csaszar
1f76074e62 [unity] Added hint about RectTransform bounds to "Skeleton Graphic" example scene to prevent problems. 2021-01-18 18:31:07 +01:00
Harald Csaszar
c84e0328f1 Merge branch '3.8' into 4.0-beta 2021-01-11 15:11:41 +01:00
Harald Csaszar
2039efc5b7 [unity] Fixed a bug introduced in previous commit 82a0de8, was not handling not-yet added RawImage components at additional CanvasRenderers. See #1826. 2021-01-08 19:28:32 +01:00
Harald Csaszar
82a0de85bc [unity] Fixed SkeletonGraphic with multiple materials displaying white square and issuing error when number of renderers changes in SkeletonGraphic.Rebuild. Closes #1826. 2021-01-08 17:59:18 +01:00
Harald Csaszar
e95e130e9b [unity] Changed implementation of previous bugfix commit ab91a35 of Editor error messages upon startup. Uses less code and executes a bit earlier. See #1779. 2021-01-07 20:52:14 +01:00
Harald Csaszar
ab91a3539d [unity] Fixed Editor error messages upon startup, most likely due to AssetDatabase not being fully initialized (Unity 2020.2). Closes #1779. 2021-01-07 20:25:01 +01:00
Harald Csaszar
a7f629f504 [unity] Fixed BoneFollowerGraphic silently failing at Transform instead of RectTransform by requiring component RectTransform. Closes #1828. 2021-01-07 16:20:19 +01:00
Harald Csaszar
bbae2d9ed4 Merge branch '3.8' into 4.0-beta 2020-12-22 17:21:32 +01:00
Harald Csaszar
769f048f55 [unity] Added a null-check for _diffuseRamp parameter at Sprite shaders GUI. Cleaned up URP 2D example assets: textures and materials now all using straight alpha textures, names shortened. 2020-12-22 17:17:33 +01:00
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
Harald Csaszar
3d3f019817 [unity] Changed default Sprite shader ramp mode from Old Hard to Hard for 4.0 and newer. This will affect newly created materials only. See commit 2fde05e. 2020-12-09 19:22:13 +01:00
Harald Csaszar
90f7f909eb Merge branch '3.8' into 4.0-beta 2020-12-09 19:09:08 +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
ac63150958 [unity] Increased URP and LWRP package version number for Unity Package Manager (for last commit's modifications). 2020-12-02 21:11: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
Harald Csaszar
eb3d56c9e8 [unity] Fixed Atlas asset assignment upon import which did not prioritize an atlas of the same name as the skeleton. Closes #1818. 2020-12-01 16:20:12 +01:00
Harald Csaszar
f365815127 [unity] Fixed preferences constantly loading in Unity 2020.1+ when not at default location. Closes #1817. 2020-11-30 20:05:27 +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
af9d807460 [unity] Fixed URP Sprite shader shadow artifacts at cascade border (occured after Universal RP package versions 7.2). Still compatible with older versions before 7.2. Closes #1814. 2020-11-26 18:33:44 +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
d62b68097e [unity] Updated example skeletons for 4.0.27+ format changes of previous csharp commit 7ef2fc9. 2020-11-16 21:23:55 +01:00
Harald Csaszar
7ef2fc96db [csharp] Porting of commits dbd90ca, da1b280, 10d5a91 and e14db0e (includes 4.0 format changes). Fixed errors in color parsing introduced by previous porting 4.0 commit.
* Added separate X and Y for transform constraint translate and scale mix.
* Renamed `xxxMix` to `mixXxx` to avoid names like `scaleXMix`.
* Added separate X and Y sliders for path constraint translate mix.
* Added a proportional spacing mode to path constraints.
* Fixed path constraint when a parent bone of the path is scaled.
2020-11-16 21:01:11 +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
407c591a2c [csharp] Ported commits 549e9ae and 6e709a1, (format changes for 4.0.24-beta) "Added separate keying for translateX/Y, scaleX/Y, shearX/Y, and colorRGB/A.". Updated example skeletons. 2020-11-12 19:34:21 +01:00
Harald Csaszar
8d0f341928 Merge branch '3.8' into 4.0-beta 2020-11-12 12:23:25 +01:00
Harald Csaszar
2243ec9e98 [unity] Corrected incorrect using statement (leading to a compile error under some conditions), related to previous commit 75b9321. Added BoundingBoxFollowerGraphic component. [..] See #1770. 2020-11-12 12:19:30 +01:00
Harald Csaszar
ceb3402627 [unity] Fixed compile error after merging commit 75b9321 to 4.0 branch. 2020-11-11 16:10:02 +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