94 Commits

Author SHA1 Message Date
mogemimi
aca157afda [cocos2d-x] Add missing switch case 2016-07-29 07:10:15 +09:00
halx99
4f3a82834c #Use Data::takeBuffer replace deep copy data.
Avoid unnecessary memory alloc & copy
2016-07-28 11:21:34 +08:00
badlogic
ffafd67873 [cocos2dx] Added SkeletonAnimation::findAnimation, closes #285 2016-07-18 17:01:47 +02:00
badlogic
103ba493d6 [cocos2dx] Closes #370, fix primitives deprecation in debug renderer 2016-07-18 16:50:02 +02:00
badlogic
db05421930 [cocos2dx] Closes #605, crash on iOS when system UI is triggered. 2016-07-18 16:19:55 +02:00
badlogic
8ec8212c5d [cocos2dx] Closes #610, closes #627 2016-07-18 16:03:15 +02:00
badlogic
6e09fb8512 [cocos2dx] Closes #378, bounding box will have zero width/height if all attachments are invisible 2016-07-18 15:23:38 +02:00
badlogic
1c192cc3fb [cocos2d-x] Closes #472, fail gracefully if file is not found 2016-07-18 15:08:45 +02:00
Mario Zechner
eb540387e6 [c][sfml][cocos2d-x][cocos2d-objc] Updated to 3.3.07 (#629) 2016-07-05 19:53:24 +02:00
John
b9bd66b36b Updated spine-c, spine-sfml, spine-cocos2d-objc and spine-cocos2dx to 3.2.01
- Updated spine-c to 3.2.01, adding shearing and transform constraints plus various bug fixes
- Introduced CMake based system to generated IDE projects for spine-sfml, and download dependencies for all other runtimes
- Updated all spine-c based runtime READMEs with new usage and example instructions
- Moved spine-cocos2d-iphone v2 and spine-cocos2dx v2 to separate branches. These will no longer be updated
- Renamed spine-cocos2d-iphone to spine-cocos2d-iphone

Removed cocos2d-ios v2 Spine runtime. See branch cocos2d-ios-v2 for legacy apps

Moved cocos2d-ios v3 Spine runtime to top-level sphine-cocos2d-iphone directory

Added Visual Studio support to CMake build

Added Linux support for spine-sfml. Do apt-get install sfml-dev as a prerequisit, makes everyone's life easier

Refactored Mac OS X framework detection and linking, added SFML_STATIC define for Win32 build

Removed spine-cocos2dx v2 runtime. See cocos2dx-v2 branch on Github

Moved spine-cocos2dx v3 runtime to root of spine-cocos2dx

spine-c, spine-cocos2d-iphone, spine-cocos2dx, spine-sfml updated to 3.2.00

* Added CMake build for spine-c and spine-sfml
* Removed spine-cocos2dx v2 and spine-cocos2d-iphone v2. See the cocos2dx-v2 and cocos2d-ios-v2 branches if you need these runtimes still
* Added transform constraint rotate, scale, and shear offsets and mixes
* Added spTransformConstraintTimeline
* Added bone shearing
* Added spShearTimeline
* Changed spSkeleton_updateCache
* Changed JSON format, see http://esotericsoftware.com/spine-json-format

Ported 1be89d1c5766fedb91f080a23bffaef6609b86c3 to spine-c

Cleaned up spine-c, removed IDE specific files and unnecessary data/ folder. Use CMake to import into your most beloved IDE

Added spine-cocos2d-iphone to CMake, only downloads cocos2d-objc dependency. Use Xcode project in spine-cocos2d-iphone/ to run examples

Added -std=c98 -pedantic -Wall to spine-c CMake file, fixed up all warnings, fixed up .gitignore

Fixed warnings, replaced calls to stdlib cos/sin/atan2 with macros

New cocos2dx example project, for Windows, Linux and Mac OS X. Doesn't work on Windows/Linux yet

Fixed spine-cocos2dx Visual Studio projects

Reworked cocos2dx dependency resolution

Fixed up src/header paths in CMake files. Dependencies are only downloaded if you build a specific runtime example

Updated spine-sfml README with instructions for Windows

Updated spine-sfml README with instructions for Linux and Mac OS X

Fixed README formatting

More formatting, sorry, can't preview markdown...

More README changes

Renamed spine-cocos2d-iphone to spine-cocos2d-objc, fixed up Xcode project and README

Updated spine-cocos2d-objc README

Added context when exceptions are thrown during attachment and animation parsing.

Added JsonRollback, a tool for converting newer JSON so it can be loaded by an older Spine version.

[Unity] Update BoneFollower

Added coverting linkedmesh to weightedlinkedmesh.

[LUA] AnimationState trackCount bugfixes (#466)

* resolved conflict

* made trackCount keep count, not maximum track index.

Prettier with varargs.

Updated .gitignore to exclude cocos2dx dependencies

Fixed up READMEs of spine-c based runtimes with proper version info. Fixed cocos2d-x CMake build to delete outdated Spine runtime shipped by cocos2d-x
2016-06-22 15:23:31 +02:00
NathanSweet
e68c830876 cocos2d-x support for: 2.2.4, 3.0, 3.1alpha1 2014-05-16 16:33:30 +02:00
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