badlogic
5d63fabcce
Merge branch 'NoctisGames-3.6' into 3.7-beta
2018-01-29 15:59:16 +01:00
badlogic
54e99f1454
[lua] Ported additive blending, see #1060 , see #1029
2018-01-29 15:37:13 +01:00
Stephen Gowen
2228c98508
Merge remote-tracking branch 'EsotericSoftware/3.6' into 3.6
2018-01-24 18:00:16 -05:00
badlogic
713f43a247
Merge branch '3.6' into 3.7-beta
2018-01-24 14:30:47 +01:00
badlogic
16d799002d
[as3] Fixed sorting of path constraint attachments. Closes #1069 .
2018-01-24 14:29:40 +01:00
badlogic
6a556de014
[as3] Ported additive blending. See #1029 , #1060
2018-01-23 15:45:33 +01:00
badlogic
b7e712d3ca
[sfml] Added owl sample.
2018-01-23 14:16:42 +01:00
badlogic
a9deff2d2f
[c] Fixed binary skeleton parsing.
2018-01-23 14:03:18 +01:00
badlogic
c24990a1c4
Merge branch '3.6' into 3.7-beta
2018-01-22 16:13:22 +01:00
badlogic
fe9ae97747
[ts][threejs] Fixed bug in core AssetManager when loading multi-page atlases. Rewrote THREE.JS renderer to support multi-page atlases. Fixed clipping in THREE.JS backend. Closes #1066 , closes #677 .
2018-01-22 16:11:42 +01:00
badlogic
2987e2ae69
[maven-release-plugin] prepare for next development iteration
2018-01-22 12:16:16 +01:00
badlogic
fc02cbba07
[maven-release-plugin] prepare release spine-libgdx-3.6.51.1
2018-01-22 12:16:10 +01:00
badlogic
53a7c311ae
Merge branch '3.6' into 3.7-beta
2018-01-22 12:06:34 +01:00
pharan
b1bfd3e8f9
[unity] Updated examples.
2018-01-21 05:53:02 +08:00
pharan
ac4f339ba2
Merge branch '3.7-beta' of https://github.com/EsotericSoftware/spine-runtimes into 3.7-beta
2018-01-21 05:44:22 +08:00
pharan
cc65d4aeea
Merge branch '3.6' of https://github.com/EsotericSoftware/spine-runtimes into 3.7-beta
2018-01-21 05:44:15 +08:00
badlogic
da6b46b7ac
Merge branch '3.7-beta' of https://github.com/esotericsoftware/spine-runtimes into 3.7-beta
2018-01-19 13:44:20 +01:00
badlogic
90e1a5ca5a
Updated owl.
2018-01-19 13:15:31 +01:00
pharan
b4c8deb283
[csharp] Animation and AnimationState 3.7
2018-01-19 05:34:20 +08:00
pharan
83778a76c1
[csharp] Add audioPath to EventData and SkeletonData
2018-01-19 02:47:44 +08:00
Stephen Gowen
945db25c6f
Merge remote-tracking branch 'EsotericSoftware/3.6' into 3.6
2018-01-18 11:13:35 -05:00
badlogic
18eec077e4
Updated owl to key blink animation properly.
2018-01-18 15:52:09 +01:00
badlogic
9aaf57959d
[ts] Updated build.
2018-01-18 15:29:49 +01:00
badlogic
b547280eb9
Updated samples, added owl.
2018-01-18 15:18:31 +01:00
badlogic
c94bec6e4e
[c] Ported additive blending, including attachment and draw order timeline fixes. See #1029 , #1060
2018-01-18 14:59:26 +01:00
pharan
da3f84b38c
[unity] Use IHasRendererObject
2018-01-18 00:47:08 +08:00
pharan
d97c80df7d
[unity] Some cleanup.
2018-01-18 00:41:42 +08:00
pharan
217215cbd7
[unity] Remove superfluous constructor. (Fix for 2018.1b)
2018-01-18 00:41:24 +08:00
pharan
4e3cf15acb
[unity] Use IHasRendererObject.
2018-01-18 00:40:42 +08:00
pharan
f6a98b0f43
[csharp] IHasRendererObject
2018-01-18 00:39:21 +08:00
pharan
aa32c1aefd
[csharp] Line endings.
2018-01-18 00:38:32 +08:00
Stephen Gowen
162cbeec72
Porting over recent change from AnimationState.c to AnimationState.cpp
2018-01-16 09:50:31 -05:00
Stephen Gowen
2bf0d3fdfa
Merge remote-tracking branch 'EsotericSoftware/3.6' into 3.6
2018-01-16 09:45:44 -05:00
badlogic
162f5a4270
Merge branch '3.6' into 3.7-beta
2018-01-12 13:46:29 +01:00
badlogic
999e836ba0
[cocos2dx] Closes #1062 , proper handling of batch boundaries.
2018-01-12 13:44:58 +01:00
NathanSweet
189ed5f885
Javadoc.
2018-01-12 11:29:44 +01:00
badlogic
396bd64241
[ts] Fix for #1060 , changes to attachment and draw order timelines.
2018-01-12 11:22:37 +01:00
badlogic
32229b17c2
Merge branch '3.7-beta' of https://github.com/esotericsoftware/spine-runtimes into 3.7-beta
2018-01-12 11:20:38 +01:00
badlogic
456d724ab0
Merge branch '3.6' into 3.7-beta
2018-01-12 11:20:31 +01:00
badlogic
d029d19a3e
[csharp] Fix for #1064 , delay was calculated incorrectly for non-loop previous track entries.
2018-01-12 11:18:54 +01:00
badlogic
095424ee98
[c] Fix for #1064 , delay was calculated incorrectly for non-loop previous track entries.
2018-01-12 11:16:35 +01:00
badlogic
b5e5d4aabb
[lua] Fix for #1064 , delay was calculated incorrectly for non-loop previous track entries.
2018-01-12 11:13:22 +01:00
badlogic
f56937c042
[as3] Fix for #1064 , delay was calculated incorrectly for non-loop previous track entries.
2018-01-12 11:10:14 +01:00
badlogic
dd61552c82
[libgdx] Fix for #1064 , delay was calculated incorrectly for non-loop previous track entries.
2018-01-12 11:08:49 +01:00
badlogic
ce124e381e
[ts] Fixes #1064 , delay was calculated incorrectly for non-loop previous track entries.
2018-01-12 11:06:22 +01:00
badlogic
4f4a4e8dce
Closes #1065 , make key pairs for mixing data unique
2018-01-12 10:34:03 +01:00
NathanSweet
6b97f44338
DrawOrderTimeline now uses setup pose before first key when applying the first animations (track 0, not layered).
...
This matches behavior of non-instant timelines (rotate, translate, etc) and AttachmentTimeline (just changed, see 82d3dd80e174f4c70c9ab81766043c3d76abd560).
2018-01-10 22:03:12 +01:00
Stephen Gowen
5718ee4097
Merge remote-tracking branch 'EsotericSoftware/3.6' into 3.6
2018-01-10 15:43:16 -05:00
badlogic
3aa70af842
Merge branch '3.7-beta' of https://github.com/esotericsoftware/spine-runtimes into 3.7-beta
2018-01-10 16:50:32 +01:00
badlogic
a3653ce51b
Closes #1058 , spine-sfml.h doesn't define SPINE_SHORT_NAMES to avoid API collisions.
2018-01-10 16:50:24 +01:00
