3596 Commits

Author SHA1 Message Date
Stephen Gowen
c3e94bee82 Merge branch 'EsotericSoftware/3.6' into 3.6 2017-10-29 15:57:13 -04:00
badlogic
3006353c8c [c] Fix handling of SP_MIX_POSE_CURRENT_LAYERED, closes #1028. 2017-10-28 16:23:27 +02:00
badlogic
ed2594deca [csharp] Fix not returning to setup pose when multiple mixing from entries end at same time. See #1027 2017-10-28 09:44:21 +02:00
badlogic
a8c5282653 [c] Fix not returning to setup pose when multiple mixing from entries end at same time. See #1027 2017-10-28 09:43:26 +02:00
badlogic
bb23c5e25c [lua] Fix not returning to setup pose when multiple mixing from entries end at same time. See #1027 2017-10-28 09:41:28 +02:00
badlogic
77c990c75e [as3] Fix not returning to setup pose when multiple mixing from entries end at same time. See #1027 2017-10-28 09:40:17 +02:00
badlogic
5b410bf2ba [ts] Fix not returning to setup pose when multiple mixing from entries end at same time. See #1013 2017-10-28 09:37:28 +02:00
Nathan Sweet
882f49f5a9 Fix not returning to setup pose when multiple mixing from entries end at same time
#1024
2017-10-28 00:20:33 +02:00
Nathan Sweet
1514b4acbb Removed bad fix for #1024 2017-10-28 00:05:56 +02:00
Stephen Gowen
6916003d13 Merge branch 'EsotericSoftware/3.6' into 3.6 2017-10-27 14:33:46 -04:00
badlogic
93d34666b0 Fixed typo in README.md 2017-10-27 10:45:29 +02:00
Stephen Gowen
d6215acf17 Merge branch 'EsotericSoftware/3.6' into 3.6 2017-10-25 16:25:33 -04:00
John
b502aa3c23 [unity] Handle null preview texture in editor. 2017-10-25 20:30:23 +08:00
Stephen Gowen
873b4d397f wip 2017-10-24 20:54:27 -04:00
Stephen Gowen
8ef11955a7 Merge branch 'EsotericSoftware/3.6' into 3.6 2017-10-24 17:56:29 -04:00
John
7c29b9573a [unity] Fix SkeletonGraphic shader alpha. 2017-10-24 18:29:01 +08:00
Stephen Gowen
10c2ae1514 Merge branch 'EsotericSoftware/3.6' into 3.6 2017-10-23 12:55:34 -04:00
John
1f704aec5e [csharp] Don't use the dip fix if mixing is complete.
Based on: 28fd5aff09
See https://github.com/EsotericSoftware/spine-runtimes/issues/1024
2017-10-24 00:41:35 +08:00
NathanSweet
28fd5aff09 [libgdx] Don't use the dip fix if mixing is complete.
closes #1024
2017-10-23 18:30:46 +02:00
NathanSweet
472392190f [libgdx] Documented track entry timeline mix types.
#1024
2017-10-23 18:15:49 +02:00
Stephen Gowen
d7a569d47d wip 2017-10-22 21:08:29 -04:00
Stephen Gowen
9129d64100 wip 2017-10-21 11:34:38 -04:00
Stephen Gowen
7b585cde41 Merge branch 'EsotericSoftware/3.6' into 3.6 2017-10-20 18:04:01 -04:00
NathanSweet
751c99ad2d Merge remote-tracking branch 'origin/3.6' into 3.6 2017-10-20 22:00:29 +02:00
NathanSweet
1e7f7026ab [libgdx] Fixed off by 1 errors. 2017-10-20 22:00:16 +02:00
NathanSweet
77b38c2ed1 [libgdx] Javadocs. 2017-10-20 22:00:08 +02:00
Stephen Gowen
f2b9e49d81 Merge branch 'EsotericSoftware/3.6' into 3.6 2017-10-20 15:00:51 -04:00
pharan
92a5faba58 [unity] Use UnityObjectViewPos in Sprite shader. 2017-10-20 17:30:53 +08:00
pharan
652506df0c [unity] Handle playModeStateChanged API change (2017.2). 2017-10-20 17:30:07 +08:00
pharan
6659902457 [unity] Add rotation param to RegionAttachment creation. 2017-10-20 17:29:33 +08:00
badlogic
299fa5dc8f [c] Fix PathConstraint length spacing for zero length bones. See #1023. 2017-10-20 11:18:52 +02:00
badlogic
52a300eeae [lua] Fix PathConstraint length spacing for zero length bones. See #1023. 2017-10-20 11:16:44 +02:00
badlogic
cbb37a6096 [as3] Fix PathConstraint length spacing for zero length bones. See #1023. 2017-10-20 11:12:58 +02:00
badlogic
bcc7da56d2 [ts] Fix PathConstraint length spacing for zero length bones. See #1023. 2017-10-20 11:09:42 +02:00
John
bdb97a023f [unity] Fix UI TintBlack shader. 2017-10-20 16:51:10 +08:00
Stephen Gowen
30dc2c08c6 Wip 2017-10-19 15:36:38 -04:00
Stephen Gowen
1b89b06b77 Merge branch 'EsotericSoftware/3.6' into 3.6 2017-10-19 10:22:52 -04:00
John
da54111238 [csharp] Fix PathConstraint length spacing for zero length bones.
see https://github.com/EsotericSoftware/spine-runtimes/issues/1023
2017-10-19 19:29:26 +08:00
John
292f1a26e3 [csharp] Fix ExposedList.Resize 2017-10-19 19:27:51 +08:00
NathanSweet
bcf90240db [libgdx] Fixed using path constraint length spacing with zero length bones. Safer float zero checks. 2017-10-19 12:44:00 +02:00
pharan
e6aebf2754 [xna] Match change in SkeletonClipping.IsClipping 2017-10-19 16:19:57 +08:00
pharan
f2bac04e43 [csharp] Resize better if T is a class. 2017-10-19 16:17:18 +08:00
pharan
a5eed13591 [csharp] Some cleanup. 2017-10-19 16:15:27 +08:00
pharan
af7471f5f4 Merge branch '3.6' of https://github.com/EsotericSoftware/spine-runtimes into 3.6 2017-10-19 16:10:03 +08:00
pharan
f51b1abf0e [unity] Match clipping behavior with editor. 2017-10-19 16:09:06 +08:00
Stephen Gowen
b385c8e6c6 Merge branch 'EsotericSoftware/3.6' into 3.6 2017-10-18 10:24:45 -04:00
Kleber Lopes da Silva
f336b9f6f5 [unity] Fix SpineAttachment skinField param.
* Fixed: skinField property from SpineAttachment attribute
* [unity] Fix SpineAttachment skinField param.
2017-10-18 11:38:48 +08:00
Stephen Gowen
072ada4c5c wip 2017-10-17 18:05:43 -04:00
Stephen Gowen
af243b4922 Return pair<Iterator, bool> just like unordered_map 2017-10-16 17:13:37 -04:00
Stephen Gowen
042e249344 Merge branch 'EsotericSoftware/3.6' into 3.6 2017-10-16 13:01:39 -04:00