3285 Commits

Author SHA1 Message Date
badlogic
521f459764 [maven-release-plugin] prepare release spine-libgdx-3.6.34.0 spine-libgdx-3.6.34.0 2017-06-19 22:42:46 +02:00
badlogic
add46aeda6 [corona] Another fix for color handling in renderer. 2017-06-19 18:23:13 +02:00
badlogic
14bd5ecbfe [corona] Fixed color handling in renderer. 2017-06-19 18:08:22 +02:00
badlogic
b443e6e609 [Lua] Fixed path constraint sorting and type check in case attachment of target is null. [cocos2dx] Fixed samples. 2017-06-19 17:49:01 +02:00
badlogic
9f569fef3b [c] Fixed sorting of path constraints when slot attachment is null. 2017-06-19 17:41:08 +02:00
badlogic
2a37edd8a6 [c] Fixed parsing of ClippingAttachments with bone weights in SkeletonJson 2017-06-19 17:38:36 +02:00
NathanSweet
2ed0561322 Merge remote-tracking branch 'origin/3.6' into 3.6 2017-06-19 17:02:33 +02:00
NathanSweet
069e3e3236 Better atlas finding. 2017-06-19 17:02:24 +02:00
badlogic
9bd1153518 Updated examples and runtime demo code 2017-06-19 16:47:28 +02:00
badlogic
283f63b466 Updated README to reflect new branching model 3.6.32 2017-06-19 14:16:40 +02:00
NathanSweet
c39c5de07a Merge remote-tracking branch 'origin/3.6-beta' into 3.6 2017-06-19 14:04:29 +02:00
NathanSweet
c5907b6714 [libgdx] Ignore clipping attachments with too few vertices.
Needed for editor, check not necessary for other runtimes.
2017-06-19 14:04:19 +02:00
pharan
397187010f [unity] More cleanup for SkeletonAnimator Update. 2017-06-18 22:00:56 +08:00
pharan
08403fa7ca [unity] Remove old Unity 4 call. 2017-06-18 21:59:52 +08:00
pharan
b40eba2a31 [unity] Updated Examples. 2017-06-18 21:58:57 +08:00
pharan
3bd5183721 [csharp] Remove Unity 4 and fix Unity 5+ check. 2017-06-18 21:57:22 +08:00
NathanSweet
58a5c8c2f0 Merge remote-tracking branch 'origin/3.6-beta' into 3.6-beta 2017-06-17 18:14:10 +02:00
NathanSweet
55b558064a Removed spineboy-old binary. 2017-06-17 18:00:02 +02:00
pharan
de1043515b Merge branch '3.6-beta' of https://github.com/EsotericSoftware/spine-runtimes into 3.6-beta 2017-06-16 12:14:22 +08:00
pharan
25578440c6 [csharp] Update CHANGELOG.md 2017-06-16 12:13:52 +08:00
pharan
ac4028d159 [unity] Update CHANGELOG.md 2017-06-16 12:13:31 +08:00
John
733f634e19 [csharp] TrackEntry.AnimationEnd setter. :p 2017-06-16 07:28:25 +08:00
pharan
0231f29d96 [unity] Update Examples. 2017-06-15 12:40:06 +08:00
pharan
a2e3d999bc [unity] Minor SkeletonAnimator and editor code cleanup. 2017-06-15 12:38:50 +08:00
pharan
e037470fb9 [unity] Add ClippingAttachment icon. 2017-06-15 12:37:18 +08:00
badlogic
fa4e521175 Updated CHANGELOG to reflect core API changes in C# 2017-06-14 22:25:30 +02:00
badlogic
afdbbc2044 Updated CHANGELOG with note on UE 4.16(.1) 2017-06-14 15:18:52 +02:00
badlogic
369c85ab42 [ue4] Updated to 4.16 2017-06-14 15:17:48 +02:00
badlogic
39b80e0e92 Merge branch '3.6-beta' of https://github.com/esotericsoftware/spine-runtimes into 3.6-beta 2017-06-14 14:59:30 +02:00
badlogic
2a973da308 [lua] Ported Animation/Timeline changes 2017-06-14 14:59:24 +02:00
pharan
265d9413d3 Merge branch 'master' into 3.6-beta
Conflicts:
	spine-unity/Assets/spine-unity/Editor/SpineEditorUtilities.cs
	spine-unity/Assets/spine-unity/Modules/SkeletonGraphic/SkeletonGraphic.cs
	spine-unity/Assets/spine-unity/SkeletonAnimator.cs
2017-06-14 19:46:14 +08:00
badlogic
060c846f75 Merge branch '3.6-timeline-animation-changes-c' into 3.6-beta 2017-06-14 13:03:21 +02:00
badlogic
1772e32a6c [c] Ported changes to Animation/Timeline. 2017-06-14 13:02:59 +02:00
John
5e0ff3694d [csharp] Cleanup VertexAttachment id threadsafety 2017-06-14 04:11:38 +08:00
pharan
61a5058a5c [csharp] Thread safety for acquiring next VertexAttachment ID. 8a78eb4cf5 2017-06-13 08:52:37 +08:00
pharan
7481a05931 [unity] Update calls to Timeline/Animation.Apply. And other cleanup. 2017-06-13 08:51:53 +08:00
pharan
44a44aa6c6 [csharp] Changed Timeline.Apply. Animation, AnimationState handle setup pose before first key. 2017-06-13 08:49:29 +08:00
badlogic
4735f3e118 [c] Preparation work for animation/timeline changes. 2017-06-13 00:53:00 +02:00
badlogic
fda2e90ce2 Added new enums 2017-06-13 00:52:03 +02:00
badlogic
ba409c8f3b [as3] Ported VertexAttachment id and Timeline/Animation#apply changes 2017-06-12 17:27:14 +02:00
badlogic
a797534476 Merge branch '3.6-beta' of https://github.com/esotericsoftware/spine-runtimes into 3.6-beta 2017-06-12 17:00:16 +02:00
badlogic
f158e9e996 [ts] Ported VertexAttachment id and Timeline/Animation#apply changes 2017-06-12 17:00:10 +02:00
NathanSweet
8a78eb4cf5 [libgdx] Thread safety for acquiring next VertexAttachment ID. 2017-06-12 16:47:16 +02:00
NathanSweet
ef6f181267 Merge remote-tracking branch 'origin/3.6-beta' into 3.6-beta 2017-06-12 02:49:03 +02:00
NathanSweet
5540b47f21 Changed Timeline#apply to enum parameters, AnimationState special cases track 0 to apply setup pose before first key. 2017-06-12 02:48:58 +02:00
Mohammad S. Babaei
d4d2165b25 [ue4] make the plugin build on UE 4.16.x (#922) 2017-06-11 21:33:14 +02:00
pharan
27d5f8df6a Merge branch '3.6-beta' of https://github.com/EsotericSoftware/spine-runtimes into 3.6-beta 2017-06-11 08:22:39 +08:00
pharan
14e718d0d3 [unity] Add vertex effect callback. 2017-06-11 08:22:10 +08:00
pharan
9cd0167a03 [unity] Allow SkeletonGraphic runtime atlas. 2017-06-11 08:20:15 +08:00
John
bf7a8db0eb [unity] Allow SkeletonGraphic runtime atlas. 2017-06-11 08:10:16 +08:00