80 Commits

Author SHA1 Message Date
NathanSweet
308e18b376 Fixed event timeline missing first event. 2013-09-29 22:51:08 +02:00
NathanSweet
b132231034 Scale bounding boxes on load. 2013-09-28 23:33:41 +02:00
NathanSweet
3797b7b7b0 Clear a track if the last entry is non-looping and reached endTime. 2013-09-28 21:28:01 +02:00
NathanSweet
4852fdca14 Renamed clearAnimation to clearTracks. 2013-09-28 20:33:56 +02:00
NathanSweet
10fa956f39 Fixed clearAnimation(int) crash. 2013-09-28 20:30:36 +02:00
NathanSweet
b854dd94c3 Fixed bugs with timeScale. 2013-09-28 20:22:56 +02:00
NathanSweet
fc92128519 Time scale, per AnimationState and per track. 2013-09-28 01:43:06 +02:00
NathanSweet
821c9ea38b Fixed crash from freeing previous twice. 2013-09-28 01:37:08 +02:00
NathanSweet
18ff56549f Allow null for setAnimation. 2013-09-27 11:41:14 +02:00
NathanSweet
5b2dfe3311 Fixed AnimationState mixing. 2013-09-26 11:35:47 +02:00
NathanSweet
b6cf39665d Nix printf. 2013-09-26 11:28:26 +02:00
NathanSweet
f8401d954a Compile with C89. 2013-09-26 11:24:40 +02:00
NathanSweet
782bde21a0 Event timeline for spine-c, AnimationState refactoring.
closes #113
2013-09-26 09:37:11 +02:00
NathanSweet
1e30ad1b72 Reset draw order in setSlotsToSetupPose. 2013-09-25 10:17:35 +02:00
NathanSweet
c96bdac26f Renamed Polygon struct. 2013-09-24 16:12:23 +02:00
NathanSweet
72339ba824 Bounding boxes for spine-c and spine-sfml. 2013-09-24 15:36:10 +02:00
NathanSweet
76778031ed Additive blending for spine-sfml. 2013-09-24 12:00:23 +02:00
NathanSweet
63f8e4ddaf Keyable draw order for spine-c. 2013-09-24 11:29:58 +02:00
NathanSweet
906ed5f0aa spine-c: inherit scale and rotation implemented. Allow to parse latest JSON. 2013-09-23 20:35:43 +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
0784725106 Merge branch 'origin/master' 2013-08-02 15:09:06 +02:00
NathanSweet
41cbe3bf3d Fixed Skeleton_setAttachment("slotname", 0). 2013-06-24 16:24:50 +02:00
NathanSweet
dcbd87d90a Added defaultMix to AnimationStateData. 2013-06-13 20:00:25 +02:00
NathanSweet
cf7cc1d0ef Minor updates. 2013-06-02 15:27:33 +02:00
NathanSweet
22fabe8769 Forgot to flip the root bone for some runtimes since the skeleton is now placed separately from the root bone. 2013-05-28 18:22:06 +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
27d6766289 Added Skin_getAttachmentName to enumerate skin attachments for a slot. Thanks James Poag! 2013-05-14 15:02:22 +02:00
NathanSweet
d30e5de5be Removed misplaced include. 2013-05-11 15:34:49 +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
3736352c09 Fixed flip x/y for root bone. (reverse-merged from commit 64fd34ba9426e2c7637526b1029721000c14ad5b)
#43
2013-05-08 13:01:10 +02:00
NathanSweet
64fd34ba94 Fixed flip x/y for root bone. 2013-05-06 14:26:23 +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
ed0bae85c3 AnimationState queued animation for more runtimes, plus fixes. 2013-04-27 14:33:38 +02:00
NathanSweet
92622246c1 AnimationState gets addAnimation methods for chaining animations.
Tabs, not spaces!
2013-04-26 20:03:28 +02:00
dazza
bd4431748c Fixed memory leaks in spine-c 2013-04-26 18:28:10 +01:00
NathanSweet
99ec8957f8 Fixed up conversion warnings in VS2010. 2013-04-25 23:39:46 +02:00
NathanSweet
e64b3c201a Fixed up remaining issues to make spine-c C89. 2013-04-25 23:19:02 +02:00
dazza
64190874d2 Fix for negtive scale in the X for an attachment working. 2013-04-25 10:43:48 +01:00
djr
f87b8c80b9 Merge remote-tracking branch 'upstream/master' 2013-04-24 21:18:17 +01:00
djr
1db2715b25 Getting the code to build on windows
Making the code C98 compliant so it can build using VS2010.
2013-04-24 20:55:32 +01:00
NathanSweet
64a0a07373 Refactoring for non-Atlas RegionAttachments. Fixed whitespace stripped and rotated regions. 2013-04-24 16:54:13 +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
10f3142720 Fixed whitespace stripped atlases. 2013-04-18 14:32:53 +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
d66f211456 Configurable memory allocation functions. 2013-04-12 09:01:43 +02:00
NathanSweet
8c2f817da9 Don't need a private, empty dispose method. 2013-04-12 08:12:25 +02:00
NathanSweet
ed6a062942 Multi line comments in case we every want to support C89. 2013-04-12 08:07:16 +02:00