483 Commits

Author SHA1 Message Date
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
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
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
115478ba8c Merge branch '3.8' into 3.9-beta 2020-02-24 15:42:57 +01:00
Harald Csaszar
41f9aeac18 [unity] Fixed a bug in SkeletonGraphic when submesh instructions are empty and clipping is active. 2020-02-24 15:42:34 +01: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
9312cf5080 Merge branch '3.8' into 3.9-beta 2020-02-17 16:22:02 +01:00
Harald Csaszar
68595c439d [unity] Fixed clipping masks not always working on additional atlas pages, when clipping end slot is first submesh attachment. Closes #1618. 2020-02-17 16:21:29 +01:00
Harald Csaszar
d386bcc466 Merge branch '3.8' into 3.9-beta 2020-02-12 16:03:18 +01:00
Harald Csaszar
405628baca [unity] Fixed Hierarchy drag-and-drop instantiation not working on empty area. Fixes #1614. 2020-02-12 16:01:14 +01:00
Harald Csaszar
3295192379 Merge branch '3.8' into 3.9-beta 2020-02-06 20:51:42 +01:00
Harald Csaszar
aa46627a52 [unity] Unity versions 2018.3+ now use TextureImporter Preset assets instead of template Texture2D assets. Closes #1524. 2020-02-06 20:48:07 +01:00
Harald Csaszar
d8af0d3d24 Merge branch '3.8' into 3.9-beta 2020-02-06 19:02:43 +01:00
Harald Csaszar
6d3e63acf7 [unity] Minor bugfixes regarding Spine texture atlas importer reference assets. See #1524. 2020-02-06 19:01:16 +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
d9f26b7dbd Merge branch '3.8' into 3.9-beta 2020-02-04 18:21:21 +01:00
Harald Csaszar
0ecc597a17 [unity] Preventing errors due to accidentally enabling TK2D defines via Spine Preferences, now only showing preferences section when TK2D is installed. Closes #1612. 2020-02-04 18:18:27 +01:00
Harald Csaszar
98393ad244 Merge branch '3.8' into 3.9-beta 2020-01-30 17:05:57 +01:00
Harald Csaszar
3a7aff7a5c [unity] Improved SkeletonGraphic's "Match RectTransform with Mesh Bounds" features: providing a button in the Inspector, automatically called when instantiated in Editor. Closes #1607.
Improved general drag and drop behaviour of SkeletonDataAssets, they are now parented to the drop mouse-over target.
2020-01-30 17:02:25 +01:00
Harald Csaszar
e611c8c82e Merge branch '3.8' into 3.9-beta 2020-01-27 12:03:43 +01:00
Harald Csaszar
ed40731684 [unity] Fixed unnecessary additional GC allocation of JSON deserializer in Editor (always caused allocation for version check). Closes #1608. 2020-01-27 12:02:16 +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
f4408185f7 Merge branch '3.8' into 3.9-beta 2020-01-21 13:44:43 +01:00