5000 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
badlogic	fe26844e3e	[ue4] Forgot to commit new queue control functions. Closes #1038	2017-11-13 14:06:11 +01:00
Stephen Gowen	d80a00ead6	wip	2017-11-12 17:27:09 -05:00
Stephen Gowen	a48f650f03	Merge branch 'EsotericSoftware/3.6' into 3.6	2017-11-12 11:21:26 -05:00
Stephen Gowen	175365a039	wip	2017-11-12 11:21:25 -05:00
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
Stephen Gowen	2a00853fe2	Forgot some cpp flags ... -fno-exceptions -fno-rtti	2017-11-09 12:19:03 -05:00
Stephen Gowen	7983a6e743	Adding CMakeLists.txt and fixing some compiler warnings	2017-11-09 12:01:17 -05:00
Stephen Gowen	e91a12cff1	wip	2017-11-09 11:04:29 -05:00
Stephen Gowen	c20f4a5c79	Forgot to add #include <stdlib.h>	2017-11-08 17:20:30 -05:00
Stephen Gowen	818d580531	Whoops, apparently I do not know how to use swap	2017-11-07 17:01:54 -05:00
Stephen Gowen	a3172ec584	Use swap instead of move (std::move was introduced in C++11)	2017-11-07 16:08:16 -05:00
Stephen Gowen	7c2b6b8271	wip	2017-11-06 16:54:39 -05:00
Stephen Gowen	04e0556c4e	Removing section of HashMap that didn't seem to work at all...	2017-11-06 11:47:08 -05: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
Stephen Gowen	51f3306a72	Temporarily commenting out some sections so I can build	2017-11-02 13:41:56 -04:00
Stephen Gowen	ac0302d09c	Merge branch 'EsotericSoftware/3.6' into 3.6	2017-11-02 11:55:46 -04: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
Stephen Gowen	5619d05536	Merge branch 'EsotericSoftware/3.6' into 3.6	2017-10-31 13:38:30 -04:00
John	06a18da27b	[unity] Fix Repacking caching.	2017-10-31 21:07:09 +08:00
Stephen Gowen	0e78d1d074	Merge branch 'EsotericSoftware/3.6' into 3.6	2017-10-30 09:59:57 -04: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