69 Commits

Author SHA1 Message Date
Harald Csaszar
f85907965c Merge branch '3.8' into 4.0-beta 2021-02-22 20:47:32 +01:00
Harald Csaszar
38d8a1362a [unity] Fixed GetRepackedSkin supporting 270 degree rotation of MeshAttachments (new atlas format, when packed with mode Polygons). Closes #1847. 2021-02-22 20:42:57 +01:00
Harald Csaszar
4a0b30dd2f [unity] Fixed URP and LWRP shaders Sprite and SkeletonLit not handling shadows correctly after 180 degree rotation (normal needs to be flipped for bias direction). Now URP shaders no longer require Advanced - Add Normals enabled to receive shadows. Closes #1842. 2021-02-17 20:16:56 +01:00
Nathan Sweet
f8d6359b32 [csharp][unity] Updated TextureAtlas parsing for latest format. 2020-12-20 15:26:05 -08: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
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
bf4df3b5f3 Merge branch '3.8' into 4.0-beta 2020-11-16 21:31:57 +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
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
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
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
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
981a3015fa [unity] Added file missing in last commit 528ab0c. See #1417. 2020-07-03 15:23:27 +02:00
Harald Csaszar
69f78b03e1 Merge branch '3.8' into 3.9-beta 2020-05-20 16:48:55 +02:00
Harald Csaszar
6a9403511d [unity] Added documentation section to GetRepackedSkin methods mentioning the requirement for Destroy() call on output textures and materials. Added to example scene component code as well. Closes #1681. 2020-05-18 17:21:58 +02:00
Nathan Sweet
79d2dbfa5f Merge branch '3.8' into 3.9-beta 2020-05-05 15:34:13 +02:00
Harald Csaszar
d35550d4f4 [unity] Now supporting Unity's SpriteAtlas as atlas provider (instead of .atlas.txt and .png files) alongside a skeleton data file. Accessible via a new tool window "Window - Spine - SpriteAtlas Import". 2020-04-29 19:39:32 +02:00
Harald Csaszar
96bb3630f2 [unity] Fixed a bug where _STRAIGHT_ALPHA_INPUT shader keyword was not set when default import settings are applied automatically (bool parameter was set, but the keyword would only be added when the Inspector is active). 2020-04-29 19:37:04 +02:00
Harald Csaszar
6fa46fbbae Merge branch '3.8' into 3.9-beta 2020-02-17 17:55:48 +01:00
Harald Csaszar
844d08b2a4 [unity] Fixed ToAtlasRegionPMAClone() methods, led to undefined behaviour when ApplyPMA followed CopyTexture. Now joined to one method call, thus also improved efficiency. Closes #1616. 2020-02-17 17:50:15 +01:00
Harald Csaszar
6c205f666f Merge branch '3.8' into 3.9-beta 2020-02-05 20:26:10 +01:00
Harald Csaszar
804d1156da [unity] Spine Preferences now provide an Atlas Texture Reference Settings parameter for applying customizable texture import settings at all newly imported Spine atlas textures. Materials Straight Alpha Texture parameter is also configured accordingly. Closes #1410, closes #1524. 2020-02-05 20:24:50 +01:00
Harald Csaszar
66da4e4282 Merge branch '3.8' into 3.9-beta 2020-01-24 13:59:33 +01:00
Harald Csaszar
d252df7ece [unity] Fixed some compiler warnings when building for platforms instead of editor. Closes #1604. 2020-01-24 13:55:45 +01:00
Harald Csaszar
28ab23d6d0 [unity] minor - fixed method comment closing tag. 2020-01-18 16:57:21 +01:00
Harald Csaszar
5a29e12fc4 Merge branch '3.8' into 3.9-beta 2020-01-18 16:55:20 +01:00
Harald Csaszar
ec7f79d460 [unity] Fixed color space of normalmap result when calling GetRepackedSkin() in Linear color space project. Providing additional parameter to specify additional texture layer color space now. Closes #1602. 2020-01-18 16:31:21 +01:00
Harald Csaszar
3cf66670cc [unity] Fixed SkinUtilities.GetClonedSkin performing shallow copy at Attachment key. Closes #1599. 2020-01-14 18:54:04 +01:00
Harald Csaszar
73ed75cef6 [unity] Fixed Timeline extension package compile error with latest 3.9-beta updates. Closes #1594. 2020-01-10 12:46:29 +01:00
Harald Csaszar
5565022e42 [unity] minor: added parameter description comment. 2020-01-08 21:29:28 +01:00
Harald Csaszar
7b02253831 [unity] Fixed GetRepackedSkin partially ignoring textureFormat argument. Closes #1593. Also added optional TextureFormat array parameter for additional texture layers. 2020-01-08 21:26:34 +01:00
Harald Csaszar
0f341f0594 [unity] Fixed GetRepackedSkin partially ignoring textureFormat argument. Closes #1593. Also added optional TextureFormat array parameter for additional texture layers. 2020-01-08 20:44:25 +01:00
Harald Csaszar
a297e7f7c5 [unity] Fixed GetRepackedSkin() ignoring mipmaps argument. Closes #1582. 2019-12-23 17:48:40 +01:00
Harald Csaszar
12897260d7 [unity] Fixed GetRepackedSkin() ignoring mipmaps argument. Closes #1582. 2019-12-23 17:34:37 +01:00
badlogic
934bec56b7 Merge branch '3.8' into 3.9-beta 2019-12-20 12:27:35 +01:00
badlogic
b67bf992a0 Single bone IK fix and license header update. Closes #1580, closes #1581. 2019-12-20 12:20:46 +01:00
Harald Csaszar
80f42c65a4 [unity] Minor cleanup, removed some useless comments. 2019-12-02 17:43:48 +01:00
Harald Csaszar
1d5189db81 [unity] Cleanup: merged common code of GetRepackedAttachments and GetRepackedSkin. See commit e3245ed. 2019-12-02 16:30:32 +01:00
Harald Csaszar
e3245ed590 [unity] Added support for additional texture channels (e.g. normal maps) at GetRepackedAttachments(). Commit before merging common code of GetRepackedAttachments and GetRepackedSkin. See #1519. 2019-12-02 16:21:45 +01:00
Harald Csaszar
d99fd64e2d [unity] Re-added removed extension method GetRepackedAttachments(). Cleanup: Removed extension methods Attachment.GetRegion(). See commit f2a8c9a. See #1557. 2019-11-29 16:45:20 +01:00
Harald Csaszar
f2a8c9a3c1 [unity][csharp] API Cleanup: removed many redundant extension methods that are now obsolete with Skin and Attachment API of 3.8. Closes #1557. Fixed an error in Skin where Skin.setAttachment() did not work as expected (See #1485). C# implementation is different to ref-impl here as struct keys do not allow for changing key.Attachment later without removing and readding the entry to the dictionary. 2019-11-29 12:31:39 +01:00
Harald Csaszar
de84c1000e [unity] Fixed Skin extension methods not copying skin bones and constraints. Closes #1556. 2019-11-28 14:40:13 +01:00
Harald Csaszar
237b33d82f [unity] Fixed Skin extension methods not copying skin bones and constraints. Closes #1556. 2019-11-28 14:39:39 +01:00
Harald Csaszar
bbbb1495b2 [unity] GetRepackedSkin allows to include normal maps (and other texture properties) during repacking via optional parameter. Closes #1519. 2019-10-09 22:06:39 +02:00