3336 Commits

Author SHA1 Message Date
badlogic
346b5a273c Fixed typo in spine-ts README.md 2017-06-26 17:31:50 +02:00
badlogic
b5f79f80c3 [xna][monogame] Added support for vertex effects, see #898 2017-06-26 17:28:34 +02:00
badlogic
c06bd8f181 Merge branch '3.6' into 3.7-beta 2017-06-26 16:21:18 +02:00
badlogic
0abefacf23 [cocos2d-objc] Added vertex effects support. See #898 2017-06-26 15:19:14 +02:00
badlogic
798f7c584f Merge branch '3.6' of https://github.com/esotericsoftware/spine-runtimes into 3.6 2017-06-26 15:01:04 +02:00
badlogic
7488383b15 [cocos2dx] Added support for vertex effects. See #898 2017-06-26 15:00:59 +02:00
John
4323329b1f [unity] Reallow manual SkeletonDataAsset setup. 2017-06-26 20:18:15 +08:00
badlogic
65d1f51acc [c][sfml] Added spVertexEffect, and some math utilities. Fixed unit tests. 2017-06-26 14:00:00 +02:00
pharan
635ef9ca97 [unity] Fix and update examples. 2017-06-26 15:34:55 +08:00
badlogic
fc06686080 Merged origin 3.6 with local 3.6 manually. 2017-06-26 09:08:53 +02:00
pharan
5a984d9f06 Merge branch '3.6' into 3.7-beta 2017-06-26 14:22:13 +08:00
pharan
83d45b5492 [tk2d] Allow Spine.AtlasAsset fallback for TK2D in inspector. 2017-06-26 14:16:14 +08:00
pharan
f62e2e12b8 [unity] Shorten BoneFollower.SetBone string API. 2017-06-26 14:14:04 +08:00
pharan
02d1bfc465 [unity] Fix SkeletonGraphic.OverrideTexture. 2017-06-26 14:13:16 +08:00
NathanSweet
b0cf3abd71 Added event audio path field. 2017-06-25 02:07:34 +02:00
NathanSweet
447cce2f84 Merge branch '3.6' into 3.7-beta 2017-06-24 18:34:49 +02:00
John
4139546b87 [csharp] Don't use DIP_MIX across tracks.
based on 61e54a5771
2017-06-24 12:44:38 +08:00
NathanSweet
61e54a5771 [libgdx] Don't use DIP_MIX across tracks.
`DIP_MIX` finds the next entry which does NOT key the timeline property and mixes out the "dip fix" (which is where a timeline is fully applied because a subsequent timeline keys the same property). This handles the case of A->B->C->D where A, B, and C key the same property but D doesn't. A uses the dip fix, then when D mixes in, `DIP_MIX` causes A to mix out, affecting B and C. If D is in another track, it is applied concurrently with A, B, and C so should not cause A to mix out.
2017-06-24 03:06:50 +02:00
badlogic
db68d1d8b4 Merge branch '3.6' into 3.7-beta 2017-06-22 20:47:19 +02:00
badlogic
114447bdeb Merged TS SkeletonClipping fix in the wrong direction... 2017-06-22 20:47:09 +02:00
badlogic
dff2891e00 Merge branch '3.6' into 3.7-beta 2017-06-22 20:46:04 +02:00
badlogic
c614de0946 [c] Initializing bone transforms to identity on creation. Closes #924. 2017-06-22 20:44:14 +02:00
badlogic
4ca68009a1 Merge branch '3.6' into 3.7-beta 2017-06-22 20:35:38 +02:00
badlogic
29b9955905 [ts] SkeletonClipping had an indexing bug when applying dark tint color to clipped triangles. Closes #926 2017-06-22 20:34:57 +02:00
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
c986050b36 Merge branch '3.6' into 3.7-beta 2017-06-22 11:47:06 +08:00
pharan
0f13ee892a [tk2d] Fix TK2D AttachmentLoader for 3.6. 2017-06-22 11:44:38 +08:00
pharan
2c88c121d6 Merge branch '3.6' into 3.7-beta 2017-06-22 11:29:32 +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
b8901a6966 Merge remote-tracking branch 'origin/3.6' into 3.7-beta 2017-06-21 21:26:15 +02: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
8d4a14b200 [ts][threejs] Added VertexEffect to SkeletonMesh 2017-06-21 16:32:12 +02:00
badlogic
b685e490c1 [ts][webgl] Fixed vertex effects for clipped attachments 2017-06-21 16:19:49 +02:00
NathanSweet
bd209b77d6 Merge remote-tracking branch 'origin/3.6' into 3.7-beta 2017-06-21 16:19:22 +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
252d03377b Merge branch '3.6' into 3.7-beta 2017-06-21 14:53:16 +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
NathanSweet
f4cff6471f Merge remote-tracking branch 'origin/3.7-beta' into 3.7-beta 2017-06-21 09:11:26 +02:00
NathanSweet
2621a75e46 [libgdx] Added audio path to SkeletonData. 2017-06-21 09:11:18 +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