1501 Commits

Author SHA1 Message Date
badlogic
691767ca1f Merge branch '3.8' into 3.9-beta 2020-06-03 17:44:21 +02:00
Harald Csaszar
c54745cbc7 [unity] Fixed an issue related to SkeletonRenderer and Prefabs not calling LateUpdate. Closes #1689. 2020-06-03 15:57:07 +02:00
badlogic
3bdd39a409 Merge branch '3.8' into 3.9-beta 2020-06-03 13:17:58 +02:00
Harald Csaszar
05d8b248b0 [unity] Fixed Mecanim state not updated when referenced clip's Loop Time changes. Also fixes Override controllers which never used the override clips' loop parameter but the original one. Closes #1649. 2020-05-29 16:20:37 +02:00
Harald Csaszar
bc559625f2 [unity] SkeletonGraphic now supports multiple atlas textures via additional CanvasRenderer GameObjects. Closes #1592. SkeletonGraphic now also supports SkeletonRenderSeparator functionality. Closes #1254. See SkeletonRenderSeparator.unity scene for a usage example. 2020-05-25 20:22:04 +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
Harald Csaszar
b1e4c8f2b7 [unity] Fixed SkeletonMecanim throwing exception at non-Spine clip. Closes #1675. 2020-05-14 17:50:45 +02:00
Harald Csaszar
3e93e2daf1 [unity] Fixed ghost-movement of Ragdoll components: They did not update the RagdollParent transform. Activate correct behaviour by disabling the inspector property Old Ragdoll Behaviour which was introduced to automatically be backwards-compatible. Closes #1670. 2020-05-07 15:10:20 +02:00
badlogic
0bcd19ef55 Merge branch '3.8' into 3.9-beta 2020-05-06 19:47:25 +02:00
Harald Csaszar
c73f8c1f42 [csharp] Ported automated test set 'AnimationStateTests' to csharp and Unity. 2020-05-06 16:03:04 +02:00
Nathan Sweet
79d2dbfa5f Merge branch '3.8' into 3.9-beta 2020-05-05 15:34:13 +02:00
Harald Csaszar
d499dba7c4 [unity] Unity SpriteAtlas support: Upon build to platform, the internally generated sprite atlas texture is used instead of the png file generated for the editor (to reduce additional memory usage). This completes Unity SpriteAtlas support, together with previous commit d35550d. Closes #940. 2020-04-29 20:44:24 +02:00
Harald Csaszar
22c5144bde [unity] Fixed a build error (build to platform only) in 'Spine Examples' after package.json structures and asmdef files have been added. 2020-04-29 20:27:38 +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
37d569414d [csharp] Minor cleanup: removed unused variable, added null tests to legacy SpriteAttacher class. 2020-04-29 16:08:29 +02:00
Harald Csaszar
201f0bd7d5 [unity] Fixed an out of bounds access in SkeletonMecanim when multiple interruptions occur. Closes #1661. 2020-04-22 16:36:01 +02:00
badlogic
d885ae45a2 Merge branch '3.8' into 3.9-beta 2020-04-13 10:29:36 +02:00
Harald Csaszar
381c23b5fc [unity] Fixed some Inspector buttons being displayed without border in Unity 2019.3. GuiStyle.Name was the problem. Fixes #1654. 2020-04-07 21:24:26 +02:00
Harald Csaszar
8a79009d4e [unity] Updated version numbers to 3.9 in package.json files added in last commit on 3.8 branch. See #1276. 2020-04-06 18:07:44 +02:00
Harald Csaszar
39b08f5044 Merge branch '3.8' into 3.9-beta 2020-04-06 18:05:46 +02:00
Harald Csaszar
3321751f98 [unity] Added package.json files to support using the spine-unity core runtime and the examples as UPM packages. This could be used to e.g. reduce compile time. See #1276. 2020-04-06 18:01:40 +02:00
Harald Csaszar
fbcd00d41a [unity] Replaced full json parsing for version string in SkeletonDataCompatibility.GetVersionInfo() with lightweight regex variant (fallback to full parsing). Affects editor only, built binary always excluded GetVersionInfo() checks. 2020-04-01 15:20:43 +02:00
Nathan Sweet
a28f490c45 Merge branch '3.8' into 3.9-beta
# Conflicts:
#	spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java
#	spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java
2020-03-30 23:33:03 +02:00
Harald Csaszar
7c2e2cb7ef [unity] Fixed a potential null reference exception reported by a user. 2020-03-30 17:46:29 +02:00
Harald Csaszar
4ef9af5b99 Merge branch '3.8' into 3.9-beta 2020-03-27 20:03:11 +01:00
Harald Csaszar
f75adfaca8 [unity] Improved Editor behaviour of RenderExistingMesh component. Removed unnecessary SkeletonGraphic codeparts from it. 2020-03-27 19:29:52 +01:00
Harald Csaszar
20d0525c22 [unity] Added Outline Shaders URP example scene demonstrating the workflow using the new RenderExistingMesh component and the new outline URP shader. 2020-03-27 18:53:53 +01:00
Harald Csaszar
519b01ee51 [unity] Added OnMeshAndMaterialsUpdated callback event to SkeletonRenderer and SkeletonGraphic. Added example component RenderExistingMesh.cs to render a mesh again with different materials, as required by the new outline-only shaders added in the previous commit. 2020-03-27 17:54:36 +01:00
Harald Csaszar
6df16d4fe1 [unity] Added ontline-only single pass shaders to LWRP and URP packages. This allows for separate outline child GameObjects that reference the existing Mesh of their parent, and re-draw the mesh using this outline shader.
The component to ease replacing materials of the parent will be added in separate upcoming commit.
2020-03-27 16:56:33 +01:00
Harald Csaszar
17e836ac25 Merge branch '3.8' into 3.9-beta 2020-03-27 12:36:54 +01:00
Harald Csaszar
3bac3da543 [unity] Added additional measures to prevent undesired setting of TK2D define. It has strangely been reported as enabled as if the respective button was pressed, although it never appeared - potentially a unity inspector UI bug. 2020-03-27 12:35:01 +01:00
Harald Csaszar
afc616fe3c Merge branch '3.8' into 3.9-beta 2020-03-26 16:15:52 +01:00
Harald Csaszar
501677b969 [unity] Fixed SkeletonMecanim unnecessarily applying clips twice. Closes #1648. 2020-03-26 16:12:33 +01:00
Harald Csaszar
5eddac05ac Merge branch '3.8' into 3.9-beta 2020-03-23 13:49:53 +01:00
Harald Csaszar
16c81c7b97 [unity] Fixed Update potentially not being called after Initialize in the first frame after instantiation in certain conditions. Closes #1646. 2020-03-23 13:49:31 +01:00
Harald Csaszar
30eae619d2 Merge branch '3.8' into 3.9-beta 2020-03-17 11:42:56 +01:00
Harald Csaszar
36a6d62ef0 [unity] Fixed null reference exception at ActivateBasedOnFlipDirection Component. Closes #1643. 2020-03-17 11:42:07 +01:00
Harald Csaszar
4a2019a723 Merge branch '3.8' into 3.9-beta 2020-03-11 20:09:09 +01:00
Harald Csaszar
016f438d59 [unity] SkeletonGraphic now fully supports SkeletonUtility for generating a hierarchy of SkeletonUtilityBones. Closes #1637. 2020-03-11 20:07:25 +01:00
Harald Csaszar
4ebd9917b4 [unity] Fixed drag&drop instantiation using last hierarchy node as parent when dopping over empty hierarchy area below last item. Closes #1641.
Also fixed a null reference exception in TextureModificationWarningProcessor reported by a user.
2020-03-11 15:32:08 +01:00
Harald Csaszar
b86333b11a [unity] Fixed drag&drop instantiation using last hierarchy node as parent when dopping over empty hierarchy area below last item. Closes #1641.
Also fixed a null reference exception in TextureModificationWarningProcessor reported by a user.
2020-03-11 15:30:18 +01:00
Harald Csaszar
06b532504d Merge branch '3.8' into 3.9-beta 2020-03-10 14:11:43 +01:00
Harald Csaszar
919b7badcb [unity] Added missing Fixed Normal Space option World-Space to all Sprite shaders (including URP and LWRP packages). Closes #1638. 2020-03-10 14:10:31 +01:00
Harald Csaszar
d67b3a9ccb Merge branch '3.8' into 3.9-beta 2020-03-10 12:43:49 +01:00
Harald Csaszar
daa2a76b3a [unity] Fixed Getting Started/4 Object Oriented Sample to no longer use Spineboy-unity asset but Spineboy-pro instead (which is included as a complete Spine example project on the editor side). See #1628. 2020-03-10 12:41:51 +01:00
Harald Csaszar
6a912b5d5a Merge branch '3.8' into 3.9-beta 2020-03-06 14:56:25 +01:00
Harald Csaszar
a4127df1a8 [unity] Fixed Tint black being ignored when used in combination with additive. Secondary dark color was not premultiplied with alpha before passed to the shader but multiplied in shader, which was wrong (as alpha was set to 0 for additive blending then). Closes #1634. 2020-03-06 14:53:56 +01:00
Harald Csaszar
81a192debe Merge branch '3.8' into 3.9-beta 2020-03-02 17:06:02 +01:00