3770 Commits

Author SHA1 Message Date
badlogic
90e1a5ca5a Updated owl. 2018-01-19 13:15:31 +01: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
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
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
Piotr Jastrzebski
a46b3d1d0c TwoColorPolygonBatch implements Batch interface, updated gdx to 1.9.8 (#1057)
* TwoColorPolygonBatch implements Batch interface, updated gdx to 1.9.8

* Add missing @Override
2018-01-10 16:38:52 +01:00
badlogic
c3e1f9bc15 Fixed #1059 for spine-ts. 2018-01-10 16:36:52 +01:00
badlogic
82d3dd80e1 Closes #1059, AttachmentTimeline handles setup and first blends the same before the first key frame, setting the attachment to the setup pose attachment. 2018-01-10 16:32:25 +01:00
badlogic
cbc8231b18 Merge branch '3.6' into 3.7-beta 2018-01-09 13:21:05 +01:00
John
4416582216
[unity] BoneFollower should use cached value. 2018-01-09 17:30:40 +08:00
John
c2dea9f9fd
[unity] BoneFollower. Negate rotation from negative scaleX. 2018-01-09 17:26:11 +08:00
John
92cacd7e6d
[unity] BoneFollower. Negate rotation from negative scaleX. 2018-01-08 21:16:20 +08:00
John
5e563c883d
[unity] Include Unity 5.6 for clipInfoCache API usage. 2018-01-06 21:30:37 +08:00
John
97c5293fb1
[unity] Fix MecanimTranslator clearing incompletely. 2018-01-05 14:11:52 +08:00
badlogic
d4d9f7103c Merge branch '3.6' into 3.7-beta 2018-01-02 14:00:44 +01:00
badlogic
1c04803b59 Merge branch '3.6' of https://github.com/esotericsoftware/spine-runtimes into 3.6 2018-01-02 14:00:28 +01:00
badlogic
f4a5911dea Fixed bug in TrackEntry#setTimelineData, closes #1055. 2018-01-02 14:00:20 +01:00
John
9a65761814
[unity] Fix auto-assigning BoneFollower bone. 2017-12-22 14:16:39 +08:00
John
5be75c9f6d
[unity] Handle invalid SkeletonAnimation property behavior. 2017-12-21 07:40:22 +08:00
John
613b098b53
[unity] Handle animation not found. 2017-12-21 07:11:24 +08:00
John
45c67ee4bc
[unity] SlotTintBlackFollower sample separate assembly 2017-12-20 07:16:37 +08:00
John
bc6a2ea129
[unity] Slot GetColor GetColorTintBlack extensions 2017-12-20 07:15:34 +08:00
John
46df0cd9b9
[unity] SpriteAttacher separate assembly 2017-12-20 07:10:32 +08:00
badlogic
ee7d9d27eb Merge branch '3.6' into 3.7-beta 2017-12-15 09:48:07 +01:00
pharan
ab4fcb48ec [unity] GetRepackedSkin NullReferenceException. 2017-12-15 09:45:05 +08:00
pharan
d7eff92375 [unity] Updated docs. 2017-12-15 09:43:43 +08:00
pharan
ad8964380e [unity] ISkeletonDataAssetComponent 2017-12-15 09:43:16 +08:00
pharan
21d56f4b98 [unity] Move asset inspector scripts to the main Editor folder. 2017-12-15 09:41:59 +08:00
pharan
b06dc2134d [unity] Fix method name typo. 2017-12-15 09:40:34 +08:00
pharan
baa6ed3e60 [unity] Fix clipper skipping non-rendered slot. 2017-12-15 09:39:40 +08:00
badlogic
7dcc1d05f3 Merge branch '3.7-beta' of https://github.com/esotericsoftware/spine-runtimes into 3.7-beta 2017-12-14 11:03:34 +01:00
badlogic
e8fa57e3aa Merge branch '3.6' into 3.7-beta 2017-12-14 11:03:22 +01:00
DemiDroL
33cd0a6a75 Dereferencing of the null pointer 'boneMap' fix (#1048) 2017-12-14 11:02:48 +01:00
badlogic
53c3645209 Merge branch '3.6' into 3.7-beta 2017-12-11 14:00:48 +01:00