477 Commits

Author SHA1 Message Date
Harald Csaszar
9427732038 [unity] Added UnscaledTime property at SkeletonAnimation, behaving like SkeletonGraphic.UnscaledTime. 2022-05-30 20:58:25 +02:00
Harald Csaszar
4b4e96b788 [unity] Minor import code refactoring, shall not change anything. 2022-05-24 17:17:20 +02:00
Harald Csaszar
f26b12821e Merge branch '4.0' into 4.1-beta 2022-05-24 16:37:15 +02:00
Harald Csaszar
6fc6e090ae [unity] Fixed rare import error that material.mainTexture is null ("Material is missing texture"). 2022-05-24 16:31:58 +02:00
Harald Csaszar
3869519145 Merge branch '4.0' into 4.1-beta 2022-05-09 11:54:27 +02:00
Harald Csaszar
a82b24a649 [unity] Fixed drag and drop code affecting other non-Spine drag and drop events, introduced in commit 29e0e917. See #2077. 2022-05-09 11:50:17 +02:00
Harald Csaszar
1b51bebb8e Merge branch '4.0' into 4.1-beta 2022-05-06 15:23:51 +02:00
Harald Csaszar
29e0e9172b [unity] Fixed drag and drop instantiation for Unity 2021.2 and newer (which provides a new callback method). Closes #2077. 2022-05-06 15:12:14 +02:00
Harald Csaszar
8dc4ee4a6e Merge branch '4.0' into 4.1-beta 2022-05-05 18:24:43 +02:00
Harald Csaszar
362a9fcd20 [unity] Added additional null checks (unlikely to trigger, but added for sake of correctness). 2022-05-05 18:23:21 +02:00
Harald Csaszar
7df6c6e767 Merge branch '4.0' into 4.1-beta 2022-05-05 18:07:27 +02:00
Harald Csaszar
3ad0192912 [unity] Quick fix of last commit was incorrect, sorry, fixed for real now. 2022-05-05 18:04:47 +02:00
Harald Csaszar
f63dd6027e [unity] Fixes compile error on code branch for old Unity versions < 2018.3 of (added by previous commit). 2022-05-05 17:51:19 +02:00
Harald Csaszar
31daf2c7df Merge branch '4.0' into 4.1-beta 2022-05-05 17:36:53 +02:00
Harald Csaszar
d00be040e2 [unity] Fixed null reference exception upon import when default shader is used but preferences has default shader set to a non-existing/null shader path. 2022-05-05 17:34:21 +02:00
Harald Csaszar
d0770a99cb [unity] Fixed automatic partial re-import when atlas png texture and/or material have been deleted and re-exported. Closes #1650. 2022-04-28 18:18:11 +02:00
Harald Csaszar
f04a7b38ca [unity] Fixed exception after changing animation name with existing custom mix duration, closes #1874. Displaying animation/bone/etc name in red in Inspector fields when it no longer exists at the skeleton data. 2022-04-27 20:49:40 +02:00
Harald Csaszar
a23217c8f7 Merge branch '4.0' into 4.1-beta 2022-04-26 19:20:41 +02:00
Harald Csaszar
edea4bef94 [unity] Now keeping manually placed AnimationClip Events when updating skeleton assets (Mecanim). Closes #1838. 2022-04-26 19:18:28 +02:00
badlogic
83df6b7316 Merge branch '4.0' into 4.1-beta 2022-04-21 14:05:53 +02:00
Harald Csaszar
70277b8f04 [unity] Fixed incorrect reloading behaviour (especially of deform timeline) at Domain Reload. (Fix of previous commit 0820bd7). Closes #2066. 2022-04-13 20:41:58 +02:00
Harald Csaszar
156ef80a9c [unity] Setting SkeletonGraphic CanvasRenderer.cullTransparentMesh to false at new instances to avoid Add blend mode problems. 2022-04-08 11:18:50 +02:00
Harald Csaszar
25a8a3aa1e Merge branch '4.0' into 4.1-beta 2022-04-07 16:37:07 +02:00
Harald Csaszar
0820bd7024 [unity] Fixed incorrect reloading behaviour (especially of deform timeline) at Domain Reload. Closes #2066. 2022-04-07 16:36:20 +02:00
Mario Zechner
78e8f637bb Merge branch '4.0' into 4.1-beta
# Conflicts:
#	spine-ts/package-lock.json
#	spine-ts/package.json
#	spine-ts/spine-canvas/package.json
#	spine-ts/spine-core/package.json
#	spine-ts/spine-player/package.json
#	spine-ts/spine-threejs/package.json
#	spine-ts/spine-webgl/package.json
2022-03-21 19:32:37 +01:00
Harald Csaszar
ec53964603 [unity] Hopefully fixed some occurrances of a build crash when building many prefabs and textures. See #2047. 2022-03-18 15:44:34 +01:00
Harald Csaszar
935cb3b491 Merge branch '4.0' into 4.1-beta 2022-03-07 18:10:46 +01:00
Harald Csaszar
20c421c1d4 [unity] Fixed changing atlas asset at SkeletonData asset not reloading automatically. Closes #2037. 2022-03-01 19:23:18 +01:00
Harald Csaszar
b2c45b7fde Merge branch '4.0' into 4.1-beta 2022-03-01 12:27:56 +01:00
Harald Csaszar
4cb0f16ae6 [unity] Minor: removed a debug log statement added in commit 299ab8f. 2022-03-01 12:24:03 +01:00
Harald Csaszar
6a3fb6a42a [unity] Added warnings when Spine Preferences - Texture Atlas Settings PMA and blend mode materials PMA do not match. Added straight alpha blend modes material templates. 2022-02-28 16:14:44 +01:00
Harald Csaszar
299ab8fff8 [unity] Improved memory utilization during build pre- and post processing. 2022-02-24 21:34:05 +01:00
Harald Csaszar
3688bdb25e [unity] SkeletonRootMotion components now support rotation root motion. 2022-02-23 20:49:15 +01:00
Harald Csaszar
dcb593489b [unity] Unity SpriteAtlas Support: Removed unnecessary material reference to generated editor atlas texture in pre-build step. See #1900. 2022-02-17 11:13:53 +01:00
Harald Csaszar
a4e7654bc5 [unity] Fixed prefab baking ignoring separated timelines. Closes #2035. 2022-02-16 21:18:42 +01:00
Harald Csaszar
ece6530b0c [unity] Fixed exception at prefab baking. Closes #2034. 2022-02-16 20:04:02 +01:00
Harald Csaszar
c523576895 [unity] Fixed exception at prefab baking. Closes #2034. 2022-02-16 19:51:02 +01:00
Harald Csaszar
5af852d83f [unity] Unity SpriteAtlas Support: Removed unnecessary material reference to generated editor atlas texture in pre-build step. See #1900. 2022-02-15 14:54:30 +01:00
Harald Csaszar
684693fd1c Merge branch '4.0' into 4.1-beta 2022-02-10 17:06:28 +01:00
Harald Csaszar
dc2bddd883 [unity] Fixed import issue when suitable atlas found in multiple directories, wrong one could be assigned if named identically. Closes #2033. 2022-02-10 17:04:52 +01:00
Harald Csaszar
3289550eb0 [unity] Added skeleton component Inspector parameter Advanced - Animation Update with modes In Update, In FixedUpdate and Manual Update. Added SkeletonRootMotion properties PreviousRigidbodyRootMotion and AdditionalRigidbody2DMovement. 2022-02-09 12:22:02 +01:00
Harald Csaszar
76068cc4f4 Merge branch '4.0' into 4.1-beta 2022-02-07 16:25:34 +01:00
Harald Csaszar
431910d660 [unity] Timeline add Track menu naming improvements. Changed clip property Custom Duration to Default Mix Duration (inverted). Improved track appearance in the Timeline window and track Inspector. 2022-02-04 14:38:24 +01:00
Harald Csaszar
135d9819a7 Merge branch '4.0' into 4.1-beta 2022-01-19 20:22:07 +01:00
Harald Csaszar
5f51705f13 [unity] Fixed Resolve atlases dialog failing to load just created atlas asset. Closes #2024. Fixed an unnecessary exception thrown after aborting skeleton import and adjusting blend mode materials. 2022-01-19 20:21:19 +01:00
Harald Csaszar
1cc2a57be5 Merge branch '4.0' into 4.1-beta 2022-01-10 18:28:36 +01:00
Harald Csaszar
1233bce55e [unity] Support fix prefab override via mesh filter global settings. Closes #1938. 2022-01-10 18:21:55 +01:00
Harald Csaszar
af4a511722 Merge branch '4.0' into 4.1-beta 2021-12-15 17:03:06 +01:00
Harald Csaszar
a77f9010f3 [unity] minor formatting, format checks failed after commit 193882f. 2021-12-15 17:01:56 +01:00
Harald Csaszar
2d86973980 Merge branch '4.0' into 4.1-beta 2021-12-15 16:55:15 +01:00