356 Commits

Author SHA1 Message Date
badlogic
95f3a1fe17 [c] Fixed bug in Triangulator/SkeletonClipping regarding labeled gotos. Closes 895 2017-05-09 15:00:34 +02:00
badlogic
4ee17864a2 Merged manually with master. @pharan please check AttachmentTools, stretchyman diffuse pma material 2017-05-09 13:32:19 +02:00
badlogic
676b740269 [c] Added stride to spSkeletonClipping_clipTriangles. [cocos2dx] Added clipping. 2017-04-30 19:13:11 +02:00
badlogic
d52ac2afd4 [c][sfml] Added clipping. [cocos2dx] Added stub for clipping and assets. [c] Fixed handling of indices short -> unsigned short 2017-04-28 14:31:18 +02:00
badlogic
537f033dad [c] Added SkeletonClipping and unit/leak test 2017-04-27 14:19:02 +02:00
badlogic
59eb90eb66 [c] Added Triangulator. Decomposition is leaking. 2017-04-24 13:58:55 +02:00
badlogic
8feed9f455 [c] Formatting 2017-04-21 12:41:29 +02:00
badlogic
458c1bc19d [c] Added dynamic array. 2017-04-21 12:39:33 +02:00
badlogic
18b63d18a6 [c] Added ClippingAttachment and loading code 2017-04-21 11:16:06 +02:00
badlogic
69711476fc [c] Fixed _isNan. VC++ evaluates 0/0 at compile time and errors out with C2124 as the constant is a division by zero. 2017-04-19 15:08:33 +02:00
badlogic
14c1df8cfb [c] Ported AnimationState change
[ts] Rebuild artifacts
2017-04-10 15:45:13 +02:00
badlogic
01b20b568b [c] Fixed dipping problem fix 2017-04-10 13:37:36 +02:00
badlogic
e326db5f4b [c] Ported dipping problem fix, see #867 2017-04-06 14:43:12 +02:00
badlogic
58b992136b [c] Fixed strcmp bug in SkeletonJson.c. Closes #870. 2017-04-03 11:02:31 +02:00
badlogic
4415cc456b [c] Added isNan check that shouldn't care whether the compiler is IEEE compliant or not. Closes #734. 2017-03-20 11:25:41 +01:00
badlogic
3ed9290c6f [cocos2d-objc] More two color tinting work. 2017-03-14 13:14:23 +01:00
badlogic
1be3c1a6b4 [c] Implemented two color tinting. We use our own batching/shader, see SkeletonTwoColorBatch. Currently, every two color tinted skeleton is its own batch. Enable two color tinting by SkeletonRenderer::setTwoColorTint(true) for a specific skeleton instance 2017-02-28 15:36:04 +01:00
badlogic
787a525a93 [runtimes] Closes #842, sorting of transform constraints 2017-02-23 15:44:31 +01:00
badlogic
a04c0088cb Merge branch 'master' into 3.6-beta 2017-02-23 14:38:23 +01:00
badlogic
f617ff635f [runtimes] Added parsing of local/relative properties of TransformConstraints in SkeletonJson 2017-02-20 11:22:26 +01:00
badlogic
023bec462f [c] Fixed transform constraint binary reading, didn't read local/relative properties 2017-02-20 10:56:50 +01:00
Mario Zechner
95527b630a [c] Added void* userData field to spTrackEntry. Can be fetched in listeners. 2017-02-02 10:56:46 +01:00
badlogic
5908d3a7d6 Merge branch 'master' into 3.6-beta 2017-01-31 14:12:59 +01:00
badlogic
cde9b3e89d [ue4][c] Fixed spine-ue4 for UE 4.15, need to explicitely include IAssetTool.h. Also fixed atlas.c to not use assignment in a conditional, something VC++ does not support 2017-01-31 14:12:20 +01:00
badlogic
fe8eae4b8e [c] Ported 3.6 changes, two color timeline, changed updateWorldVertices to computeWorldVertices, point attachment, transform constraint local and relative mode. Does not actually render two color tinted slots yet. Also updated example exports 2017-01-30 16:31:16 +01:00
badlogic
c2cfbc6cb8 [c] Made kvec.h use Spine FREE/MALLOC so custom allocators need only be injected in a single place. Thanks @Rattenhirn. 2017-01-23 10:45:24 +01:00
caiocsabino
0b74269207 NDK wouldn't compile unless some type casts in AnimationState.c and Skeleton.c were explicitly declared (#813) 2017-01-09 14:22:46 +01:00
badlogic
45b5935483 [c] Ported fix from f3dbc650f83ae698443bb34ad4034dad9946fa08 2016-12-28 21:31:30 +01:00
badlogic
f07c2967d5 [c] Fixed up c-unittests on GCC/Linux 2016-12-20 11:18:26 +01:00
badlogic
fe33e912c6 [c] Fix for clearTracks, see #805 2016-12-15 13:32:44 +01:00
badlogic
31b5011acf [c] Fixes memory leak in SkeletonBinary.c. Closes #796 2016-12-12 09:31:30 +01:00
badlogic
e8fa99557e [c] Ported latest AnimationState changes, see c512ee5d595076842cbb12d95a3a7f06792b81d1 2016-12-06 13:49:35 +01:00
badlogic
27bd17f067 [c] IK bend direction had a sign conversion issue in SkeletonBinary when using -funsigned-char. Closes #794. 2016-12-05 18:24:20 +01:00
badlogic
dfd0410acb [c] Ported latest AnimationState changes. See #792 2016-12-02 15:43:58 +01:00
taigacon
9fedf6877a Fix a bug caused a crash on VS2013 or later when in Debug mode if there is any Unicode chars such as Chinese in Atlas file. (#788) 2016-12-02 15:06:50 +01:00
badlogic
873ed16a53 [c] Added callback recursion issue to test suite 2016-11-29 18:45:36 +01:00
badlogic
6fe1e8fa68 [c] Fixed rotation timeline handling in AnimationState. Fixed main.cpp missing a break 2016-11-29 13:27:15 +01:00
badlogic
0d444eb5de [c] Ported latest AnimationState changes 2016-11-28 16:44:16 +01:00
badlogic
4e0fdc022b [c] Another sigseg fix in AnimationState 2016-11-28 16:27:48 +01:00
badlogic
387b0afb80 [c] Added spine-c-tests (thanks @jpoag), fixed up CMake build 2016-11-28 16:00:46 +01:00
badlogic
f63e1625ab [c] Need to dispose mixingFrom explicitely in spAnimationState_disposeTracks, instead of disposeTrack. A mixingFrom entry may be smoked as part of disposing its parent before an event for the mixing from entry is processed in the event queue. 2016-11-28 15:08:17 +01:00
badlogic
900001098b [c] Fixed leak in AnimationState, wasn't disposing mixing from entries when entire state is disposed. Confirmed that disposing of mixing froms is done properly if anim state is allowed to update until the mixing from is done. 2016-11-25 16:02:49 +01:00
badlogic
98e49a7e11 [c] Fixed more leaks. 2016-11-24 16:48:32 +01:00
badlogic
f44cbaa044 [c] Added spAnimationState_disposeStatics to appease memory leak detectors. 2016-11-24 15:29:45 +01:00
badlogic
76137540ba [c] Another memcpy error 2016-11-24 15:08:53 +01:00
badlogic
7fc9d1a26a [c] fixed bug in spAnimationState_addPropertyID, didn't keep track of #properties. Closes #774 2016-11-24 15:01:23 +01:00
badlogic
a0f0e2ee1f [c] Fixed memory leak in spTrackEntry_dispose, closes #770 2016-11-24 13:41:25 +01:00
badlogic
a0484cc63d [c] Fixed memcpy bugs, closes #771 2016-11-24 13:36:50 +01:00
badlogic
a73c5084b5 [c] Ported AnimationState changes 2016-11-24 12:38:03 +01:00
badlogic
56c6780fa8 [c] Closes #768, fallthrough in event queue passed wrong event type 2016-11-23 11:31:03 +01:00