2247 Commits

Author SHA1 Message Date
badlogic
721cbf0260 [as3] Ported AnimationState changes 2016-11-24 13:28:50 +01:00
badlogic
7637fdbefd [as3] Updated FDT projects to use player 23 2016-11-24 13:22:26 +01:00
badlogic
c0908f19ed [lua] Ported AnimationState changes 2016-11-24 13:01:14 +01:00
badlogic
aca4060fad [lua] Ported AnimationState changes 2016-11-24 13:00:46 +01:00
badlogic
a7fe570148 [ts] Ported AnimationState changes 2016-11-24 12:48:45 +01:00
badlogic
a73c5084b5 [c] Ported AnimationState changes 2016-11-24 12:38:03 +01:00
pharan
be13e57bbc Merge branch 'master' of https://github.com/EsotericSoftware/spine-runtimes 2016-11-24 02:43:27 +08:00
pharan
abb1b013a5 [csharp] AnimationState fixes. 2016-11-24 02:42:37 +08:00
NathanSweet
020f557004 [libgdx] Fixed losing mixingFrom when calling setAnimation twice.
closes #761
2016-11-23 16:58:53 +01:00
NathanSweet
6d7217d44c [libgdx] Fixed AnimationStateTests.
It now takes one extra frame for a track to be cleared when trackEnd is reached.
2016-11-23 16:52:17 +01:00
NathanSweet
e3d916e9e3 Merge remote-tracking branch 'origin/master' 2016-11-23 16:38:30 +01:00
NathanSweet
deca6bb92f [libgdx] Reset to setup pose when trackEnd is reached. 2016-11-23 16:37:08 +01:00
pharan
25c2ca7b1b [csharp] UpdateMixingFrom fixes. 2016-11-23 22:11:47 +08:00
NathanSweet
d66df0775b Merge remote-tracking branch 'origin/master' 2016-11-23 13:38:54 +01:00
NathanSweet
99ca32dabb [libgdx] Only remove mixingFrom entries from the end of the list.
http://esotericsoftware.com/forum/3-5-Mixing-carries-over-multiple-animations-7430?p=34364#p34364
2016-11-23 13:38:44 +01:00
badlogic
56c6780fa8 [c] Closes #768, fallthrough in event queue passed wrong event type 2016-11-23 11:31:03 +01:00
NathanSweet
40cbe8620d [libgdx] During mix, use timeScale from the most current animation. 2016-11-22 17:49:49 +01:00
badlogic
04e4d1f40d [c] Fixed memory leak in AnimationState.c 2016-11-22 14:18:11 +01:00
badlogic
37b6fe3c11 [c] Fixed bug in AttachmentTimeline, wrong order of trinary operator expressions 2016-11-22 13:52:19 +01:00
badlogic
2e252783a7 [lua] Fixed bug in AnimationState, indexing of timelines was incorrect. Fixed but in AttachmentTimeline, called wrong setAttachment 2016-11-21 13:53:03 +01:00
NathanSweet
65982c7eca Merge remote-tracking branch 'origin/master' 2016-11-20 15:20:52 +01:00
NathanSweet
e7d25dc2cb [libgdx] Reset rotation direction when changing TrackEntry alpha. 2016-11-20 15:08:01 +01:00
pharan
5779d0e09a [unity] Simplified Sprite shader GUI. 2016-11-19 09:19:01 +08:00
pharan
a4ee7e3b4d [unity] Description for baking now that it's hidden. 2016-11-19 08:15:46 +08:00
pharan
78855cdb70 [unity] Fix SkeletonUtility and BoundingBox functionality. 2016-11-19 08:14:33 +08:00
pharan
4dc462e7a8 [unity] Fix backwards conditional. Some cleanup. 2016-11-19 06:39:40 +08:00
pharan
ece4e93118 [csharp] Fix and cleanup a few typos. 2016-11-19 06:35:00 +08:00
NathanSweet
dced060658 Merge remote-tracking branch 'origin/master' 2016-11-18 13:05:14 +01:00
NathanSweet
979d8072bc [libgdx] Default to 30 FPS. 2016-11-18 13:05:08 +01:00
pharan
175d60438a Merge branch 'master' of https://github.com/EsotericSoftware/spine-runtimes 2016-11-18 16:53:07 +08:00
pharan
18e1f9a976 [unity] ToddRivers Sprite Shader 2016-11-18 16:52:07 +08:00
badlogic
2888ece970 [lua] Closes 760, passed wrong type to setAttachment 2016-11-18 09:49:54 +01:00
pharan
752516e00f [unity] SkeletonRagdoll fix for 3.5 AnimationState 2016-11-18 06:10:50 +08:00
pharan
d57aa03680 [unity] Minor fix to sample scene. 2016-11-18 05:56:03 +08:00
pharan
2c46ad7d5c [unity] SkeletonTint as optional shader. 2016-11-18 05:44:33 +08:00
John
e95b778633 [unity] Fixed looping Mecanim clips. 2016-11-18 05:40:01 +08:00
John
a400ee3bf2 [unity] Handle obsolete TextureImporter API in 5.5 2016-11-16 10:40:14 +08:00
NathanSweet
d52d2e72ee Updated READMEs, supported version is 3.5.xx. 2016-11-15 23:29:27 +01:00
NathanSweet
36000e3c55 Updated to v3.5 (merge dev branch).
# Conflicts:
#	spine-c/src/spine/AnimationState.c
2016-11-15 23:10:23 +01:00
Alireza Ashayer
87499ee545 Allocated more memory for events to prevent heap corruption when using events with large string data (#749) 2016-11-10 16:20:25 +01:00
badlogic
6eb86fd3a1 [lua] Closes #739, forgot math_min/max assignemnts 2016-10-20 14:38:13 +02:00
badlogic
e93e9e77c4 [lua] Closes #739, bug in Skeleton:getBounds, need to nil check attachment 2016-10-20 14:37:24 +02:00
badlogic
315e2eef40 [lua] Closes #729, error in texture atlas parser 2016-10-20 14:33:21 +02:00
badlogic
f41790af99 Merge branch 'master' of https://github.com/esotericsoftware/spine-runtimes 2016-10-19 12:01:07 +02:00
badlogic
69889d8a07 [c] Fixes compilation in VS201x 2016-10-19 12:00:59 +02:00
pharan
3bcf399227 [unity] Added some multi-editing support. 2016-10-19 09:04:10 +08:00
badlogic
6629a7d332 [lua] Fixed type in SkeletonJson.lua 2016-10-17 14:20:36 +02:00
John
92236380c0 [unity] Fix backwards json check. 2016-10-17 18:50:57 +08:00
NathanSweet
97756d6921 Added version placeholder for building JAR. 2016-10-17 11:27:36 +02:00
NathanSweet
4a8d02a144 Cleaned up contribution comments. 2016-10-16 00:25:08 +02:00