83 Commits

Author SHA1 Message Date
NathanSweet
4defc3146a Return the texture while Spine is using it. 2014-05-16 12:10:27 +02:00
sbrednikhin
0dd179b4b4 vector and matrix names fixed
Vector -> Vec2
Matrix -> Mat4
according to cocos 2dx 3.1 alpha branch
2014-05-16 10:54:38 +03:00
NathanSweet
df312f4d24 Deleted forward declaration. 2014-05-15 19:50:00 +02:00
NathanSweet
df959cb646 Meshes, FFD and skinning for cocos2d-x. 2014-05-14 21:49:35 +02:00
NathanSweet
36809166a2 Make AnimationState TrackEntry create/dispose functions optional.
closes #218
2014-05-12 17:12:24 +02:00
NathanSweet
7199d22417 Better AnimationState listeners, including on a TrackEntry. 2014-05-11 21:00:50 +02:00
NathanSweet
728cc12c3e Clean up. 2014-05-08 23:18:10 +02:00
NathanSweet
90ec4db279 C++11 AnimationState listener.
Because 2014.
2014-05-08 22:29:50 +02:00
NathanSweet
5c6ebf2c63 cocos2d-x updated to 3.1alpha0.
No meshes yet.
2014-05-08 19:21:50 +02:00
NathanSweet
26e4fb0d74 License header update.
2 -> 2.1 (clearer how permission is granted, formatting).
2014-04-23 12:04:43 +02:00
NathanSweet
8a66c3cd0a Include algorithm for std::min/min. 2014-03-07 14:36:55 +01:00
NathanSweet
9780af9524 Fixed premultiplied alpha. 2014-02-01 01:27:58 +01:00
NathanSweet
b0c96fd66b Typo 2014-01-11 21:20:46 +01:00
NathanSweet
d520addb9b Updated license to version 2.
Version 1 of the license didn't make sense: it required a Spine license to use the Spine Runtimes at all. This means if you used the Spine Runtimes in your application, anyone who purchased a copy of your application also needed a Spine license to use the runtimes. This was not the intent!

Version 2 of the license fixes this by allowing anyone to use the Spine Runtimes but only for internal use. When you purchase Spine, the Spine license (http://esotericsoftware.com/spine/files/license.txt) grants you the right to make and distribute derivative works of the Spine Runtimes. Now it makes sense: making and distributing applications with the Spine Runtimes requires a Spine license, but anyone can run that software without needing a Spine license.

With this fixed, I hope we never need to change the license again!
2014-01-11 21:07:28 +01:00
NathanSweet
104b79379f Made getTextureAtlas virtual. 2013-12-05 18:50:31 +01:00
NathanSweet
5e2e5ed8d9 Fixed memory leaks.
closes #148
2013-10-31 09:10:29 +01:00
NathanSweet
6862eec5af Made 0 scale use "content scale factor". Commented drawOrder animation. 2013-10-30 14:25:16 +01:00
NathanSweet
8df81c9fbb closes #140 2013-10-14 19:20:41 +02:00
NathanSweet
2bff08de4b Prefixed all spine-c structs and functions with "sp".
Holy refuctoring! Sorry for the change, but some libraries were having naming conflicts. You can define SPINE_SHORT_NAMES before including spine-c headers if you want to use structs and functions without the "sp" prefix, as it was before.
2013-10-09 03:43:16 +02:00
NathanSweet
1d8e12442e Don't crash if animation is not found.
http://www.esotericsoftware.com/forum/viewtopic.php?f=7&t=1379
2013-10-08 12:06:56 +02:00
NathanSweet
9a347d5eb8 Updated license.
Nailed it this time, quite sure!
2013-10-04 04:13:09 +02:00
NathanSweet
47ce2a40c1 Minor update to the license to include education. 2013-10-01 14:55:15 +02:00
NathanSweet
37035c4a0f Additive blending for cocos2d and cocos2dx. 2013-09-30 00:54:21 +02:00
NathanSweet
e4358cf904 Fixed ("fixed") Android rendering, #33. 2013-09-30 00:54:09 +02:00
NathanSweet
4852fdca14 Renamed clearAnimation to clearTracks. 2013-09-28 20:33:56 +02:00
NathanSweet
ba60fb99bd Draw quads before resizing.
#33
2013-09-28 10:02:43 +02:00
NathanSweet
a7913e35ba Better example. 2013-09-27 11:41:23 +02:00
NathanSweet
86f8c564a4 Minor update. 2013-09-27 09:38:10 +02:00
NathanSweet
8674909fab Removed extern. 2013-09-27 08:47:46 +02:00
NathanSweet
957f5a539e Renamed setListener to setAnimationListener. 2013-09-26 22:55:17 +02:00
NathanSweet
9443ecb09c cocos2dx style AnimationState event callback for CCSkeletonAnimation. 2013-09-26 21:44:22 +02:00
NathanSweet
067a84339b spine-cocos2dx updated to latest spine-c API.
This has some API breakage, sorry. The new AnimationState now handles multiple "tracks", which makes it easier to apply and queue multiple animations at the same time, no longer do we need multiple AnimationStates.
2013-09-26 12:14:55 +02:00
NathanSweet
6441bd93b6 Wasn't using drawOrder. 2013-09-25 12:17:53 +02:00
NathanSweet
0cc7258580 spine-cocos2dx now compiles with latest spine-c. 2013-09-24 16:12:51 +02:00
NathanSweet
e2fccf72d6 License update.
Changed from New BSD to a custom license. The new license requires a Spine license to use the code. If you have a valid Spine license, you can do whatever you like with the code. This should not be a problem for anyone using the runtimes with Spine, nothing changes. If using the runtimes without a Spine license, you now need a Spine license. This is because the runtimes were created explicitly to be used with Spine.
2013-09-20 19:46:23 +02:00
NathanSweet
00803c42a5 Fixed CCSkeletonAnimation.
Oops!
2013-06-12 13:45:09 +02:00
NathanSweet
d0732921c9 Added getAnimationState. 2013-06-11 18:23:40 +02:00
NathanSweet
e6d7cf8b26 Add x and y to skeleton for positioning instead of using root bone. 2013-05-28 18:17:55 +02:00
NathanSweet
7cae307c55 Default time scale to 1. 2013-05-23 12:45:31 +02:00
NathanSweet
a4bd912dc1 Fixed premultiplied images (the default). 2013-05-12 14:22:12 +02:00
NathanSweet
bcc0b60050 Slightly better boundingBox. 2013-05-10 13:55:01 +02:00
NathanSweet
cdadffc156 Removed spine namespace from spine-c.
Didn't make any sense for a C API and complicated integration with ObjC.
2013-05-08 20:09:10 +02:00
NathanSweet
3f3449ca99 Added getTextureAtlas method when not using AtlasAttachmentLoader. 2013-05-06 17:59:06 +02:00
NathanSweet
7f69300bcc Refactoring: changed references to "bind pose" to "setup pose".
This better matches "setup mode" in the editor and we can be consistent in code and docs from now on.
2013-05-05 12:38:06 +02:00
NathanSweet
80fdba02a1 Refactoring: RegionAttachment vertices, texture->rendererObject...
- Vertices are no longer stored on RegionAttachment. The vertices are temporary state, not part of RegionAttachment's persistent state like UVs and offset.
- AtlasPage and RegionAttachment "texture" field is renamed to "rendererObject". This is a better name as it may not be a texture.
- AtlasAttachmentLoader uses the AtlasRegion as the rendererObject. This enables a renderer to use region information if needed. The page rendererObject is still available.
- Better "enum" look up for AS3.
- Unity4 example doesn't use a compressed material.
2013-05-05 12:37:24 +02:00
NathanSweet
9cadc92b97 Brought back some convenience methods.
Anything more than this and you have to use the C API!
2013-05-01 17:58:08 +02:00
NathanSweet
35b45a564b Clean up. 2013-04-30 18:50:12 +02:00
NathanSweet
b7ac58b0d2 Fixed static methods. 2013-04-30 12:20:21 +02:00
NathanSweet
2bee31ad2a Minor updates. 2013-04-30 12:18:23 +02:00
NathanSweet
0d488eafe6 Refactoring to make it easier to load a SkeletonData in a subclass constructor. 2013-04-29 14:45:26 +02:00