3304 Commits

Author SHA1 Message Date
NathanSweet
3c01f212d6 Merge remote-tracking branch 'origin/3.6' into 3.6 2017-06-22 10:35:16 +02:00
NathanSweet
1a92702456 Less odd control flow.
End result is the same.
2017-06-22 10:35:08 +02:00
pharan
0f13ee892a [tk2d] Fix TK2D AttachmentLoader for 3.6. 2017-06-22 11:44:38 +08:00
pharan
4e7a409a63 [csharp] Fixed mixing unweighted meshes that aren't keyed on frame zero. a8e1faf4dd 2017-06-22 11:27:46 +08:00
pharan
f9a4107e41 [unity] BoneFollower.SetBoneByName. 2017-06-22 11:24:22 +08:00
pharan
0f3786d869 [unity] Cleaner Vertex Effect API. 2017-06-22 11:21:06 +08:00
NathanSweet
256db33d11 Merge remote-tracking branch 'origin/3.6' into 3.6 2017-06-21 21:25:31 +02:00
NathanSweet
3c1c829e97 Remove unused import. 2017-06-21 21:25:26 +02:00
badlogic
b685e490c1 [ts][webgl] Fixed vertex effects for clipped attachments 2017-06-21 16:19:49 +02:00
badlogic
df4fb90402 Merge branch '3.6' of https://github.com/esotericsoftware/spine-runtimes into 3.6 2017-06-21 16:08:24 +02:00
badlogic
40010cb228 [ts] Fixed SwirlEffect 2017-06-21 16:08:17 +02:00
NathanSweet
5138d703f3 Merge remote-tracking branch 'origin/3.6' into 3.6 2017-06-21 15:46:38 +02:00
NathanSweet
a8e1faf4dd [libgdx] Fixed mixing unweighted meshes that aren't keyed on frame zero.
closes #925
2017-06-21 15:46:33 +02:00
badlogic
5aebd65c01 [ts][webgl] Added VertexEffect, SwirlEffect and JitterEffect, and implemented it in WebGL SkeletonRenderer. SwirlEffect is a bit broken.. 2017-06-21 15:43:54 +02:00
badlogic
16af9b9a5c Updated CHANGELOG with VertexEffect addition to libGDX 2017-06-21 14:52:28 +02:00
badlogic
ddf38c0ce1 [libGDX] VertexEffect now also lets you modify UVs and light/dark color. 2017-06-21 14:35:55 +02:00
badlogic
37f555a5c7 [ue4] Removed ProceduralMeshComponent reference from example project. Breaks HTML5 build. Thanks @NuLL3rr0r 2017-06-20 19:46:34 +02:00
pharan
55fb613b48 [unity] Built-in shaders for SkeletonGraphic tint black. 2017-06-20 10:00:06 +08:00
badlogic
c9de3116f0 [maven-release-plugin] prepare for next development iteration 2017-06-19 22:42:53 +02:00
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