1050 Commits

Author SHA1 Message Date
Harald Csaszar
3b17c20c9b [unity] Fixed conflicts after merge of 3.7 into 3.8-beta branch. 2019-05-03 14:07:12 +02:00
badlogic
4f3d2d8057 Merge branch '3.7' into 3.8-beta 2019-05-03 10:53:34 +02:00
Harald Csaszar
db6c39007b [unity] Fixed Timeline scripts not automatically being recompiled when Timeline Package Support - Enable was selected. Closes #1326. 2019-05-02 18:54:15 +02:00
Harald Csaszar
25386671b1 [unity] Fixed Timeline scripts not automatically being recompiled when Timeline Package Support - Enable was selected. Closes #1326. 2019-05-02 18:53:06 +02:00
Harald Csaszar
da97eeb62f [unity] Menu section added for old git 3.7 branch menu, for easier consistent git merges later. Timeline support in Unity 2019, see #1326. 2019-05-02 12:45:54 +02:00
Harald Csaszar
b198c9b48d [unity] More robustness changes for asmdef files and Timeline support in Unity 2019, see #1326. 2019-05-02 12:43:58 +02:00
Harald Csaszar
66f5ca29ac [unity] Renamed .asmdef files to .txt files to prevent overwriting important automatic modifications when unpacking newer unitypackages over it. For Timeline support in Unity 2019, see #1326. 2019-05-02 12:43:31 +02:00
Harald Csaszar
cb615007d6 [unity] Added support for Timeline in Unity 2019, using existing components. Please visit Edit-Preferences-Spine to enable Timeline support. Closes #1326. 2019-05-02 12:43:03 +02:00
Harald Csaszar
3c6f8f96e4 [unity] Menu section added for old git 3.7 branch menu, for easier consistent git merges later. Timeline support in Unity 2019, see #1326. 2019-05-02 12:20:34 +02:00
badlogic
7c01654321 [unity] Added missing license headers. 2019-05-02 11:46:52 +02:00
badlogic
09130b15df Merge branch '3.7' into 3.8-beta 2019-05-02 11:43:36 +02:00
badlogic
67f469b06d Merge branch '3.7' of https://github.com/esotericsoftware/spine-runtimes into 3.7 2019-05-02 11:38:47 +02:00
badlogic
7f7e5f0fec Updated license headers and LICENSE files. 2019-05-02 11:38:19 +02:00
Harald Csaszar
5e7e03d8f4 [unity] Fixed error message "Animator is not playing an AnimatorController" at SkeletonMecanim and prefabs. Closes #1344. 2019-05-02 11:23:24 +02:00
Harald Csaszar
74560c66a3 [unity] Fixed error message "Animator is not playing an AnimatorController" at SkeletonMecanim and prefabs. Closes #1344. 2019-05-02 11:19:25 +02:00
Harald Csaszar
d9962bfb09 [unity] More robustness changes for asmdef files and Timeline support in Unity 2019, see #1326. 2019-04-30 19:58:00 +02:00
Harald Csaszar
c6fa814c6d [unity] Renamed .asmdef files to .txt files to prevent overwriting important automatic modifications when unpacking newer unitypackages over it. For Timeline support in Unity 2019, see #1326. 2019-04-30 18:36:47 +02:00
Harald Csaszar
0d2ab87816 [unity] Added support for Timeline in Unity 2019, using existing components. Please visit Edit-Preferences-Spine to enable Timeline support. Closes #1326. 2019-04-30 18:10:48 +02:00
Harald Csaszar
d4829f014f [unity] Fixed casting exception when use custom atlas asset. Closes #1342. 2019-04-29 17:54:51 +02:00
Harald Csaszar
cd703b38cf [unity] Fixed casting exception when use custom atlas asset. Closes #1342. 2019-04-29 17:54:25 +02:00
Harald Csaszar
02fc928318 [unity] Reverting last commit changes again since Unity's auto code updater still causes mixed line endings on Unity 2019 due to ignoring #if branches in shaders. Will be changed in gitattributes instead to change cginc to lf. 2019-04-27 11:57:31 +02:00
Harald Csaszar
c8594a66c4 [unity] Reverting last commit changes again since Unity's auto code updater still causes mixed line endings on Unity 2019 due to ignoring #if branches in shaders. Will be changed in gitattributes instead to change cginc to lf. 2019-04-27 11:54:19 +02:00
Harald Csaszar
f53ce3734c [unity] Prevented a warning to appear in Unity 2017.3 and newer. Code auto-update previously caused mixed line endings. 2019-04-27 10:28:35 +02:00
Harald Csaszar
751476265b [unity] Prevented a warning to appear in Unity 2017.3 and newer. Code auto-update previously caused mixed line endings. 2019-04-27 10:20:17 +02:00
Harald Csaszar
a180194c0a [unity] Saving Spine - Preferences in EditorPrefs too for consistency, used when first creating SpineSettings.asset in a new project. See 1336. 2019-04-27 09:58:08 +02:00
Harald Csaszar
bb52cce293 [unity] Automatically copying previous Spine - Preferences settings over to SpineSettings.asset at first creation. See 1336. 2019-04-26 19:21:49 +02:00
Harald Csaszar
bd69b9bc38 [unity] Now using SettingsProvider for Preferences - Spine menu. This stores Spine settings in Assets/Editor/SpineSettings.asset which can be shared with team members. Fixes a warning. Closes #1336. 2019-04-26 18:42:04 +02:00
Harald Csaszar
89e759a8f5 [unity] Fixed initial animation not being mixed out in some circumstances due to PoseSkeleton call. Removed PoseSkeleton and PoseWithAnimation extension methods to prevent related issues on user side. Fixed incorrect random Nth frame preview in Scene view for SkeletonAnimation and SkeletonGraphic. Closes #1340. 2019-04-25 18:41:56 +02:00
Harald Csaszar
58e495ecae [unity] Fixed unnecessary updates in editor when SkeletonRenderer is selected. Closes #1339. 2019-04-25 16:37:31 +02:00
Harald Csaszar
e09ea0b212 [unity] Fixed unnecessary updates in editor when SkeletonRenderer is selected. Closes #1339. 2019-04-25 16:35:11 +02:00
Harald Csaszar
4ff249fa30 [unity] Removed 2 of 3 warnings in Unity 2019.1. See #1336. 2019-04-22 22:13:44 +02:00
Harald Csaszar
ee3655f4d3 [unity] Removed 2 of 3 warnings in Unity 2019.1. See #1336. 2019-04-22 22:09:23 +02:00
Harald Csaszar
bf93b00e6b [unity] Fixed SkeletonDataAsset auto-update mechanism on .json file change for both scene view and inspector. Closes #1330. 2019-04-18 19:53:55 +02:00
Harald Csaszar
14a98545a1 [unity] Fixed SkeletonDataAsset auto-update mechanism on .json file change for both scene view and inspector. Closes #1330. 2019-04-18 19:53:03 +02:00
Harald Csaszar
dfb5ed1106 [unity] Fixed "Skin not found: default" error at binary .skel.bytes files and SkeletonGraphic. Fixes #1332. 2019-04-18 17:02:00 +02:00
Harald Csaszar
5e4141cbdd [unity] Fixed "Skin not found: default" error at binary .skel.bytes files and SkeletonGraphic. Fixes #1332. 2019-04-18 17:00:58 +02:00
Harald Csaszar
356fb38442 [unity] Fixed broken inspector preview in Unity7 2019. Closes #1331. 2019-04-17 18:10:01 +02:00
Harald Csaszar
299ffc6de8 [unity] Fixed broken inspector preview in Unity7 2019. Closes #1331. 2019-04-17 18:09:20 +02:00
Harald Csaszar
5fc3f99d4b [unity] Fixed SkeletonMecanim leftover animation rotations when transitioning to an empty "Write Defaults" state. Fixes #1321. 2019-04-05 14:34:55 +02:00
Harald Csaszar
a3916b82c8 [unity] Fixed SkeletonMecanim leftover animation rotations when transitioning to an empty "Write Defaults" state. Fixes #1321. 2019-04-05 14:34:08 +02:00
Harald Csaszar
9bb5a0d044 [unity] Fixed SkeletonMecanim layer blend modes, now it detects Override/Add from the animation controller. Also fixed some animator related warnings in editor. Closes ##1317. 2019-04-02 19:48:17 +02:00
Harald Csaszar
646e6aec56 [unity] Fixed SkeletonMecanim layer blend modes, now it detects Override/Add from the animation controller. Also fixed some animator related warnings in editor. Closes ##1317. 2019-04-02 19:47:00 +02:00
Harald Csaszar
d03de3fdf7 [unity] Fixed wrong atlas assets being assigned upon import when multiple skeletons are exported to the same directory. Closes #1312. 2019-03-26 17:03:40 +01:00
Harald Csaszar
91532f19b1 [unity] Fixed wrong atlas assets being assigned upon import when multiple skeletons are exported to the same directory. Closes #1312. 2019-03-26 17:00:39 +01:00
Harald Csaszar
f0e9164648 [unity] Ported AnimationState and Animation changes, references in spine-unity. See #1303. 2019-03-20 18:44:12 +01:00
Harald Csaszar
ad20319387 [unity] Added missing Create 2D Hinge Chain button at SkeletonUtilityBone inspector, only 3D version was available. Closes #1310. 2019-03-20 18:18:55 +01:00
Harald Csaszar
0d44a041e9 [unity] Added missing Create 2D Hinge Chain button at SkeletonUtilityBone inspector, only 3D version was available. Closes #1310. 2019-03-20 18:17:00 +01:00
badlogic
efc212110d Merge branch '3.7' into 3.8-beta 2019-03-13 11:38:07 +01:00
Harald Csaszar
75d16a4fc9 [unity] Improved warnings for incorrect material settings, now not triggering at non-Spine shaders. See #1305. 2019-03-12 18:55:00 +01:00
Harald Csaszar
f004e74965 [unity] Fixed Exception in incorrect material setting detection mechanism. Fixes #1305. 2019-03-12 18:34:25 +01:00