4074 Commits

Author SHA1 Message Date
Stephen Gowen
fc09ed9745 wip 2017-10-13 15:31:58 -04:00
badlogic
f14db028b0 [ts] More playground changes. 2017-10-13 17:17:45 +02:00
badlogic
2cb75e437b Merge branch '3.6' of https://github.com/esotericsoftware/spine-runtimes into 3.6 2017-10-13 16:50:05 +02:00
badlogic
c4df324038 [ts] playing around with playground. 2017-10-13 16:49:03 +02:00
NathanSweet
5f03186b36 Merge remote-tracking branch 'origin/3.6' into 3.6 2017-10-13 16:34:31 +02:00
NathanSweet
6dcd54368d [libgdx] Added filtering checkbox to Skeleton Viewer. 2017-10-13 16:34:28 +02:00
badlogic
1fc3aab814 Merge branch '3.6' into 3.7-beta 2017-10-13 14:53:36 +02:00
badlogic
5a7db58772 Updated CHANGELOG. 2017-10-13 14:53:21 +02:00
badlogic
9a6da01892 Merge branch '3.6' into 3.7-beta 2017-10-13 14:52:11 +02:00
badlogic
20b081ad5a [xna] Made MeshBatcher of SkeletonRenderer accessible. Users can use this instead of the less capable XNA SpriteBatch and ensure maximum batching. See #953. 2017-10-13 14:51:50 +02:00
badlogic
9106f96309 Merge branch '3.6' into 3.7-beta 2017-10-13 14:44:27 +02:00
badlogic
aab6d81e34 [ue4] Fixed tint black, see #1003. 2017-10-13 14:44:10 +02:00
badlogic
16579d8dcc Merge branch '3.6' into 3.7-beta 2017-10-13 14:16:37 +02:00
badlogic
77014b9f46 [monogame] Fixed tint black, see #1003. 2017-10-13 14:16:26 +02:00
badlogic
9c0860a591 Merge branch '3.6' into 3.7-beta 2017-10-13 14:13:12 +02:00
badlogic
791d813bf1 [cs][xna] Fixed tint black, see #1003. Opened up Triangulator and SkeletonClipping for debug rendering. 2017-10-13 14:12:57 +02:00
badlogic
d6737858e8 Merge branch '3.6' into 3.7-beta 2017-10-13 09:51:15 +02:00
badlogic
9cb8745deb Updated CHANGELOG 2017-10-13 09:51:03 +02:00
Jare Guo
041b6ddb00 [cocos2dx] allow load custom atlas texture in _spAtlasPage_createTexture for CocosCreator (#1018) 2017-10-13 09:50:03 +02:00
Stephen Gowen
54e54b21ca Merge branch 'EsotericSoftware/3.6' into 3.6 2017-10-12 12:18:12 -04:00
badlogic
1a7c11e86f Merge branch '3.6' into 3.7-beta 2017-10-12 15:40:21 +02:00
badlogic
77221b4cee [ue4] SkeletonRendererComponent now generates collision meshes by default. 2017-10-12 15:39:58 +02:00
badlogic
86fadc695c Merge branch '3.6' into 3.7-beta 2017-10-12 14:37:33 +02:00
badlogic
14108679bb [c] Added void* userData to spAnimationState to be consumed in callbacks. Closes
#1017.
2017-10-12 14:36:58 +02:00
NathanSweet
f4b3d6ddab Merge branch '3.6' into 3.7-beta 2017-10-11 15:14:44 +02:00
badlogic
dc16e55647 [c] Fixed DeformTimeline, see #1016. 2017-10-11 11:27:29 +02:00
badlogic
bb97951cf9 [lua] Fixed DeformTimeline, see #1016. 2017-10-11 11:20:40 +02:00
badlogic
bd3b5cd1fe Merge branch '3.6' of https://github.com/esotericsoftware/spine-runtimes into 3.6 2017-10-11 11:10:29 +02:00
badlogic
902e5e5432 [starling] Reverted example changes. 2017-10-11 11:10:23 +02:00
John
4277027e0d [csharp] Don't mix from uninitialized vertices. See https://github.com/EsotericSoftware/spine-runtimes/issues/1016 2017-10-11 17:09:59 +08:00
badlogic
f31d98506c [as3] Fixed DeformTimeline, see #1016. 2017-10-11 11:05:08 +02:00
badlogic
adc01ab1e4 [ts] Fixed DeformTimeline, see #1016. 2017-10-11 10:43:13 +02:00
NathanSweet
9df8790c5e Merge remote-tracking branch 'origin/3.6' into 3.6 2017-10-10 19:11:25 +02:00
NathanSweet
33d4c60ac7 [libgdx] Don't mix from uninitialized vertices. Clear vertices instead of leaving them in current state before first key when alpha is 1. More efficient clearing of deform before first key. 2017-10-10 19:11:20 +02:00
Stephen Gowen
deb1b78c55 Merge branch 'EsotericSoftware/3.6' into 3.6 2017-10-10 10:14:49 -04:00
badlogic
66070960a5 Merge branch '3.6' into 3.7-beta 2017-10-10 15:37:43 +02:00
badlogic
8650c668e9 [cocos2dx] Removed hard coded scratch buffer size, replaced with dynamic allocation. Also made it a global scratch buffer, instead of a per instance buffer. Saves 4kb per SkeletonRenderer instance. Closes #1015. 2017-10-10 15:37:27 +02:00
badlogic
377aee58ec [c] Replaced call to locale dependent strtof with customer float parser. Closes #1009 2017-10-10 12:42:03 +02:00
Stephen Gowen
69f1e88ea6 Merge branch 'EsotericSoftware/3.6' into 3.6 2017-10-09 18:24:49 -04:00
NathanSweet
4d7d448197 Merge remote-tracking branch 'origin/3.6' into 3.6 2017-10-09 11:52:32 +02:00
NathanSweet
812510e948 [libgdx] Avoid batch flush when switching between normal and additive rendering with PMA. 2017-10-09 11:52:29 +02:00
NathanSweet
76f0b208d9 Changed SV bg color to match editor default bg color (when gradient is off and square alpha is 0). 2017-10-09 11:52:01 +02:00
NathanSweet
f06bfd9f16 [libgdx] Better exception message for Batch that can't render meshes. 2017-10-09 11:44:00 +02:00
Stephen Gowen
26eabbf1df wip 2017-10-08 19:03:24 -04:00
Stephen Gowen
20db47d4b7 Merge branch 'EsotericSoftware/3.6' into 3.6 2017-10-06 16:35:52 -04:00
Stephen Gowen
4b48dae7f5 wip 2017-10-06 16:35:51 -04:00
John
bc6132b051 [unity] Assign default struct values.
This prevents compiler errors with certain settings. Reproed in Unity 2017.3 beta
based on dddc1d3c67
@dorisugita
2017-10-07 00:49:08 +08:00
Mario Zechner
d61782201f Update README.md 2017-10-06 15:26:07 +02:00
badlogic
3dbab2122d [c] Fixed KMemory and test harness for GCC on Linux. 2017-10-06 15:22:49 +02:00
Stephen Gowen
6c81a6e392 Merge branch 'EsotericSoftware/3.6' into 3.6 2017-10-05 15:31:22 -04:00