92 Commits

Author SHA1 Message Date
Mario Zechner
a98f76f13f Update README.md 2016-06-22 21:20:14 +02:00
Søren Nielsen
59f472de3c Update README.md 2016-06-22 21:14:31 +02:00
badlogic
6e71449974 Fixed merge conflicts 2016-06-22 15:33:35 +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
e834982b49 Updated READMEs for v3.3 support. 2016-06-20 19:26:05 +02:00
NathanSweet
8d7f761311 spine-libgdx updated to 3.2.00.
* Added transform constraint rotate, scale, and shear offsets and mixes.
* Added TransformConstraintTimeline.
* Added bone shearing.
* Added ShearTimeline.
* Changed Skeleton#updateCache.
* Changed JSON and binary formats. Some binary format fields and enums were rearranged for consistency -- sorry, but it's better for the long term. Docs for both are up to date.
http://esotericsoftware.com/spine-json-format
http://esotericsoftware.com/spine-binary-format
2016-04-26 22:51:04 +02:00
NathanSweet
b41af15f0c Cocos2d-x and SFML now respect the atlas filter and wrap settings. 2016-04-17 22:40:23 +02:00
NathanSweet
421789e6f7 spine-c updated to v3.1. 2016-04-15 12:21:22 +02:00
NathanSweet
d0d7e64b43 Docs: added a note to runtimes that don't yet support the binary format. 2016-04-07 22:50:00 +02:00
NathanSweet
4f3ccc2c51 List the supported editor version on each runtime README.
closes #526
2016-04-03 19:10:47 +02:00
NathanSweet
4e87a8c461 Fixed bounding hit detection example. 2016-03-05 10:32:34 +01:00
NathanSweet
d7d08d263a Updated spine-c and spine-sfml to Spine v3. 2016-02-16 00:14:07 +01:00
NathanSweet
00f0ec62dc Updated for SFML 2.3.2. 2016-02-15 21:04:31 +01:00
Thomas Steinholz
9e67cb4f0c Update spine-sfml.cpp 2015-11-30 11:36:45 -05:00
Thomas Steinholz
e15c1b70e3 Update spine-sfml.h 2015-11-30 11:36:29 -05:00
NathanSweet
3b5109032c Fixed goblin example. 2015-11-03 03:03:39 +01:00
NathanSweet
01cb844993 You get a license file, you get a license file, EVERYBODY GETS A LICENSE FILE! 2015-07-30 22:47:00 +02:00
NathanSweet
f06fbb3d8d Clarified licensing on runtimes pages. 2015-07-30 22:44:47 +02:00
NathanSweet
27270a5781 Spine Runtimes license update.
Minor update to fix "SOFTARE" typo and clairfy how to get permission.
2015-04-24 21:33:24 +02:00
NathanSweet
f8a76c6455 Blend modes for all runtimes. 2015-04-02 14:20:20 +02:00
pinguin999
a9f404a7e3 Merge remote-tracking branch 'upstream/master'
Conflicts:
	spine-c/include/spine/SkeletonData.h
2014-12-02 17:53:12 +01:00
Nathan Sweet
634a3b92c4 Update README.md 2014-11-13 00:47:33 +01:00
NathanSweet
b2f09b352b Reanedm goblins-ffd example to goblins-mesh. 2014-10-05 18:53:47 +02:00
pinguin999
532230f0fc FIX Memory access after free 2014-09-25 19:00:38 +02:00
NathanSweet
9749db7a0a Added IK keys to raptor example. 2014-09-01 18:41:43 +02:00
NathanSweet
2ff2d10d60 Docs. 2014-08-31 16:52:59 +02:00
NathanSweet
593956b51d Added IK, refactoring.
Skeleton moved from Slot to Bone.
Attachments no longer take x,y to compute vertices.
Bezier curves are calculated up front.
2014-08-31 15:24:36 +02:00
Furkan Üzümcü
cbb775af97 Static cast rgba value
Add static_cast to the rgba valuse to cast them to sf::Uint8, so that
compiler warnings can be avoided.
2014-07-17 03:45:31 +03:00
NathanSweet
da960ae935 Fixed leak. 2014-05-21 20:08:17 +02:00
NathanSweet
066fa3dcae Fixed TrackEntry leak. 2014-05-17 23:21:22 +02:00
NathanSweet
7af43142b9 No console window for SFML. 2014-05-12 23:29:32 +02:00
NathanSweet
c9e4d55309 Use static SFML libs. 2014-05-12 23:13:09 +02:00
NathanSweet
f869e93546 spine-c Eclipse project builds lib instead of exe, spine-sfml uses static libs. 2014-05-12 22:57:30 +02:00
NathanSweet
cc472d134f Renamed spAtlas constructor methods to match others. Added void* to spAtlas constructors.
Inside _spAtlasPage_createTexture you can use `self->atlas->rendererObject` to get the void* specified at atlas creation.
2014-05-02 17:55:54 +02:00
NathanSweet
3910298c91 SFML requires images without premultiplied alpha. 2014-05-02 10:21:40 +02:00
NathanSweet
99a8de4bb4 FFD for spine-c and spine-sfml. 2014-04-29 20:28:27 +02:00
NathanSweet
17c03bf44a Skinning for spine-sfml. 2014-04-29 00:48:23 +02:00
NathanSweet
82ea243dbb Meshes for spine-sfml.
No FFD or skinning yet.
2014-04-29 00:32:19 +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
6f51d79d9c Fixed example drawing off screen. 2014-01-25 23:53:52 +01:00
NathanSweet
661a0436bc Documentation 2014-01-20 04:51:20 +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
5f46d03c4d Moved SMFL location into project. 2014-01-06 21:26:37 +01: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
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
308e18b376 Fixed event timeline missing first event. 2013-09-29 22:51:08 +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
782bde21a0 Event timeline for spine-c, AnimationState refactoring.
closes #113
2013-09-26 09:37:11 +02:00