5037 Commits

Author SHA1 Message Date
badlogic
bdfd390dae [lua] Ported changes to AnimationState and Animation, see #1303. Also ported fix for #1352. 2019-05-15 14:59:02 +02:00
badlogic
6d8baa17fd [as3] Fix for #1352, the last subsequent attachment timeline always mixes out to the setup pose. 2019-05-15 13:55:21 +02:00
badlogic
6341fbbd9d [ts][csharp] Fix for #1352, the last subsequent attachment timeline always mixes out to the setup pose. 2019-05-15 13:52:31 +02:00
badlogic
603c9e2366 Fix for #1352. The last subsequent attachment timeline always mixes out to the setup pose. 2019-05-14 17:43:41 +02:00
Harald Csaszar
26e3f928f7 [unity][csharp] Fixed one more potential locale-based parsing exception. See #1354. 2019-05-13 16:50:49 +02:00
Harald Csaszar
ae6e63de50 [csharp] Fixed locale-based exception when parsing a Spine atlas. Closes #1354. 2019-05-13 16:47:42 +02:00
Harald Csaszar
95f08cd634 [unity] Added changelog entry for previous commit (Fixed Shadow alpha cutoff shader parameters ignoring SlotColor.alpha). See #1350. 2019-05-10 15:21:29 +02:00
Harald Csaszar
215c12cb22 [unity] Fixed Shadow alpha cutoff shader parameters ignoring SlotColor.alpha at all Spine shaders. Now the texture color is multiplied with slot color before the alpha test. Closes #1350. 2019-05-10 15:06:58 +02:00
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
badlogic
cd22ab91cb Merge branch '3.7' of https://github.com/esotericsoftware/spine-runtimes into 3.7 2019-05-03 10:51:39 +02:00
badlogic
849e9acc7e Updated READMEs. 2019-05-03 10:51:33 +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
cc7325692d [unity] Changelog cleanup: Moved two changelog sections to correct 3.8 part, were accidentally added to the end of the 3.7 list. 2019-05-02 13:56:21 +02:00
Harald Csaszar
a51776390c [unity] Updated Changelog with sections for Timeline support in Unity 2019 and changes to .asmdef files, see #1326. 2019-05-02 13:50:07 +02:00
Harald Csaszar
fd66bce31e [unity] Updated Changelog with sections for Timeline support in Unity 2019 and changes to .asmdef files, see #1326. 2019-05-02 13:40:57 +02:00
Harald Csaszar
5b0c765ca6 [unity] Moved unity changelog entry to new "Breaking Changes" section. 2019-05-02 13:00:47 +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
badlogic
86a529d01c Updated LICENSE. 2019-05-02 10:55:37 +02:00
badlogic
9cdd36133e Merge branch '3.7' into 3.8-beta 2019-05-02 10:40:15 +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
NathanSweet
0cbf91d7fd Removed Skin#getAttachments. 2019-04-29 17:33:16 +02:00
badlogic
5ebb3db8b6 [ts] Fixed all demos with handles. Handles can no longer be dragged outside the canvas. 2019-04-29 15:41:43 +02:00
badlogic
5994c347ea Fixed additive blending demo, calculations take scrolling into account. 2019-04-29 15:07:13 +02:00
badlogic
923c6c19f2 Added additive blending demo. 2019-04-29 14:28:46 +02:00
Harald Csaszar
8356401360 [unity] Updated 3.8 changelog section for latest commits. 2019-04-27 15:26:33 +02:00
Harald Csaszar
533203bf32 gitattributes: set .cginc and .shader files to lf line endings to prevent Unity code auto-updater to create mixed line endings. 2019-04-27 14:16:50 +02:00
Harald Csaszar
a7dc2b1d8f gitattributes: set .cginc and .shader files to lf line endings to prevent Unity code auto-updater to create mixed line endings. 2019-04-27 14:16:07 +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