3695 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
badlogic	ac588a6caf	Merge branch '3.7-beta' of https://github.com/esotericsoftware/spine-runtimes into 3.7-beta	2017-11-10 11:27:54 +01:00
badlogic	e267ae325f	Merge branch '3.6' into 3.7-beta	2017-11-10 11:27:45 +01:00
badlogic	4850cb7a05	Merge branch '3.6' of https://github.com/esotericsoftware/spine-runtimes into 3.6	2017-11-10 11:27:30 +01:00
badlogic	843159b6c3	[cocos2dx] Updated Android.mk. Closes #1036	2017-11-10 11:27:23 +01:00
badlogic	6e887a0d3d	Merge branch '3.7-beta' of https://github.com/esotericsoftware/spine-runtimes into 3.7-beta	2017-11-10 11:13:58 +01:00
badlogic	064a8b1377	Merge branch '3.6' into 3.7-beta	2017-11-10 11:13:50 +01:00
badlogic	33a00182ff	[ue4] Need to temporarily disable queue draining of animation state when setting or adding new animations. Closes #1037	2017-11-10 11:13:33 +01:00
Nathan Sweet	9ff80dfe72	Merge remote-tracking branch 'origin/3.7-beta' into 3.7-beta	2017-11-02 19:14:27 +01:00
Nathan Sweet	e390d9c1c9	Merge branch '3.6' into 3.7-beta	2017-11-02 19:14:12 +01:00
badlogic	cce86c1e33	Merge branch '3.6' into 3.7-beta	2017-11-02 11:36:03 +01:00
badlogic	361378b275	[c] Error in color parsing, off-by-one resulting in invalid memory access. Closes #1031. Thanks @minggo for the adress sanitizer hint.	2017-11-02 11:20:57 +01:00
badlogic	095fe71ff8	[cocos2dx] Updated to cocos2d-x 3.16.	2017-11-02 10:51:26 +01:00
badlogic	f045d22183	[ts] Added animation blending test.	2017-11-02 10:41:49 +01:00
John	06a18da27b	[unity] Fix Repacking caching.	2017-10-31 21:07:09 +08:00
badlogic	ee7411f2ec	[ts] Disallow additive on track 0, fix scale timeline.	2017-10-30 14:23:09 +01:00
badlogic	70924a9942	Merge branch '3.7-beta' of https://github.com/esotericsoftware/spine-runtimes into 3.7-beta	2017-10-30 14:20:45 +01:00
Nathan Sweet	e7c9066b49	Merge remote-tracking branch 'origin/3.7-beta' into 3.7-beta	2017-10-30 14:16:01 +01:00
Nathan Sweet	5c78859151	Fixed scale timeline. ... closes #1030	2017-10-30 14:15:43 +01:00
Nathan Sweet	c25675f75e	Disallow additive on track 0.	2017-10-30 14:15:27 +01:00
badlogic	0837774cfa	Merge branch '3.6' into 3.7-beta	2017-10-30 14:14:05 +01:00
badlogic	e6c2b75101	[ts] More test refactoring.	2017-10-30 14:12:03 +01:00
badlogic	38756e22e2	Merge branch '3.6' into 3.7-beta	2017-10-30 14:10:04 +01:00
badlogic	470ae4a1f3	[ts] More test refactoring.	2017-10-30 14:09:56 +01:00
badlogic	bbfa376e95	Merge branch '3.6' into 3.7-beta	2017-10-30 14:06:50 +01:00
badlogic	de3acaf084	[ts] reworked example/tests	2017-10-30 14:06:41 +01:00
badlogic	78a1df5c8e	[ts] Fixed DeformTimeline additive blend after last frame.	2017-10-30 14:05:12 +01:00
Nathan Sweet	70482336ac	Always compute timeline data for track 0, which cannot be additive.	2017-10-30 14:02:39 +01:00
Nathan Sweet	070b3c98d8	Merge remote-tracking branch 'origin/3.7-beta' into 3.7-beta	2017-10-30 13:58:31 +01:00
Nathan Sweet	097bf986bb	Fixed deform additive blend after last frame. ... #1030	2017-10-30 13:58:23 +01:00
badlogic	30d65cfe4a	[ts] Fixed up skins example.	2017-10-30 13:49:35 +01:00
badlogic	f750b3f708	[ts] Ported additive animation blending, see #1029.	2017-10-30 13:31:36 +01:00
badlogic	2d2344d32c	Merge branch '3.7-beta' of https://github.com/esotericsoftware/spine-runtimes into 3.7-beta	2017-10-30 10:11:54 +01:00
badlogic	581d67f490	Merge branch '3.6' into 3.7-beta	2017-10-30 10:11:26 +01:00
badlogic	ed24d3b33f	[ue4] Updated to 4.18, fixed compilation error in RuntimeMEshComponentDetails.cpp, kept compatibility with older versions.	2017-10-30 10:11:07 +01:00
Nathan Sweet	a75e166cbb	Merge remote-tracking branch 'origin/3.7-beta' into 3.7-beta	2017-10-28 20:26:57 +02:00
Nathan Sweet	72d18eefd4	Deform timeline additive	2017-10-28 20:14:08 +02:00
Nathan Sweet	5a4da17e7d	Shear timeline additive, clean up.	2017-10-28 18:11:56 +02:00
Nathan Sweet	ecedff1ffa	Can only use #1024 fix on track 0.	2017-10-28 18:11:41 +02:00
badlogic	893b9a8a93	Merge branch '3.6' into 3.7-beta	2017-10-28 16:23:36 +02:00
badlogic	3006353c8c	[c] Fix handling of SP_MIX_POSE_CURRENT_LAYERED, closes #1028.	2017-10-28 16:23:27 +02:00
Nathan Sweet	eb44a67240	Additive for translate and scale timelines	2017-10-28 15:33:19 +02:00
badlogic	aba0348d06	Merge branch '3.6' into 3.7-beta	2017-10-28 09:46:52 +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	0414803ee1	Fix not returning to setup pose when multiple mixing from entries end at same time ... #1024	2017-10-28 00:18:20 +02:00
Nathan Sweet	980352a7ce	Removed bad fix for #1024	2017-10-28 00:08:47 +02:00