51 Commits

Author SHA1 Message Date
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
916b7d01de cocos2d ObjC style AnimationState event callback for CCSkeletonAnimation. 2013-09-27 11:40:54 +02:00
NathanSweet
6441bd93b6 Wasn't using drawOrder. 2013-09-25 12:17:53 +02:00
slow_banshee
ae797c22c1 update convenience constructors for CCSkeleton, CCSkeletonAnimation 2013-09-24 17:47:42 +03:00
NathanSweet
d5cb07fea0 spine-cocos2d-iphone compiles with latest spine-c. 2013-09-24 16:28:04 +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
d0732921c9 Added getAnimationState. 2013-06-11 18:23:40 +02:00
NathanSweet
adb406a8ac Fixed leaking CCTextureAtlas. 2013-06-02 15:27:56 +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
a4bd912dc1 Fixed premultiplied images (the default). 2013-05-12 14:22:12 +02:00
NathanSweet
4823bb25c8 Added verisons. 2013-05-10 14:49:01 +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
bf6eaaae34 Forgot to check in cocos2d-iphone refactoring! 2013-05-06 13:20:02 +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
0d488eafe6 Refactoring to make it easier to load a SkeletonData in a subclass constructor. 2013-04-29 14:45:26 +02:00
NathanSweet
90180dafbb CCSkeletonAnimation separated from CCSkeleton.
Has convenience methods to apply multiple AnimationStates and queue animations.
2013-04-27 16:58:22 +02:00
NathanSweet
0c76ba47da Fix for including in .mm file. 2013-04-26 01:51:11 +02:00
NathanSweet
64a0a07373 Refactoring for non-Atlas RegionAttachments. Fixed whitespace stripped and rotated regions. 2013-04-24 16:54:13 +02:00
NathanSweet
f055dc8fd7 Removed convenience methods to make it clear that the spine-c API should be used.
Discussion here:
http://www.esotericsoftware.com/forum/viewtopic.php?f=3&t=536
2013-04-19 17:47:43 +02:00
NathanSweet
5a46f8c6b4 isComplete for AnimationState. 2013-04-19 09:14:29 +02:00
NathanSweet
7bd6f62a2b Added AnimationState clear.
id return value for factory methods.
2013-04-18 23:31:29 +02:00
NathanSweet
7193122908 Fixed cocos2d texture atlas usage.
Super cool API you got going there, cocos2d... :|
2013-04-18 19:08:34 +02:00
NathanSweet
2bc3f511a1 Refactoring to make extension easier.
Much less weird OOP needed. Rendering is separate from data objects. cocos2d-iphone and cocos2d-x support for multi page atlases.
2013-04-17 22:08:53 +02:00
NathanSweet
3defbc4132 boundingBox takes into account scale and position. #32 2013-04-17 10:03:58 +02:00
NathanSweet
a299f8b2a8 Fixed issue #32, bounding box. 2013-04-17 09:30:00 +02:00
NathanSweet
925bad7a64 Fixed cocos2d bounding box crash. 2013-04-16 16:43:04 +02:00
NathanSweet
f935a4ede0 License headers. 2013-04-11 10:42:24 +02:00
NathanSweet
e56050e3a7 Better class extension. 2013-04-11 06:06:23 +02:00
NathanSweet
a624c637c7 Added updateQuad and boundingBox. 2013-04-08 19:02:58 +02:00
NathanSweet
5bab2830a9 Fixed texture atlas capacity expansion. 2013-04-08 04:26:15 +02:00
NathanSweet
9f198b4998 Fixed cocos2d for ARC. Issue #24 2013-04-06 19:00:26 +02:00
NathanSweet
a165849d6e Clean up. 2013-04-06 18:27:51 +02:00
NathanSweet
8b8896bbeb Fixed fo C++, really this time.
Fixed iOS project.
2013-04-06 17:57:45 +02:00
NathanSweet
fa53aad63f Fixed for C++. 2013-04-06 13:40:44 +02:00
NathanSweet
c9fbe938b8 Added ifdefs for C++. 2013-04-05 22:37:06 +02:00
NathanSweet
9af1e9d9b0 Added asserts. 2013-04-05 16:24:08 +02:00
NathanSweet
6780447b83 Fancier C++/ObjC APIs to avoid C API with simple usage.
NSString instead of cstr for ObjC.
2013-04-04 17:12:21 +02:00
NathanSweet
dd27ee184c Changed Spine export format.
There are no longer separate animation files, they are now inside the skeleton file. This means there is just one file to manage, which is cleaner. Now that animations are stored in SkeletonData, they can be looked up by name which leads to cleaner runtime APIs.

cocos2d and cocos2d-x runtimes got a cleaner ObjC/C++ API.
2013-04-04 04:00:45 +02:00
NathanSweet
a398fe6201 Atlas now prefixes images referenced in the atlas file with the directory containing the atlas file. 2013-04-03 03:37:52 +02:00
NathanSweet
4bf3dde6c3 Stupid Xcode and its space indentation! 2013-04-03 03:02:58 +02:00
NathanSweet
b58d02ee4b Added animation state usage to example. 2013-04-02 18:45:47 +02:00
NathanSweet
0c1c0a3dc6 Separate projects for mac and ios. 2013-04-02 15:23:20 +02:00
NathanSweet
9cda83aba8 Added CCBlendProtocol. 2013-04-02 05:24:25 +02:00