84 Commits

Author SHA1 Message Date
NathanSweet
36000e3c55 Updated to v3.5 (merge dev branch).
# Conflicts:
#	spine-c/src/spine/AnimationState.c
2016-11-15 23:10:23 +01:00
NathanSweet
c0fdc454a2 Fixed inconsistent newlines.
License header was followed by \n\n and files ended with \n. Changed to \r\n.
2016-10-15 23:45:16 +02:00
NathanSweet
7a18f0818c Every space in its place! (tm)
(whitespace clean up)
2016-10-15 23:15:41 +02:00
badlogic
5aa27771c3 [runtimes] Updated ALL sources to use latest Spine Runtimes License v2.5. Manually checked all the things... 2016-10-13 15:12:05 +02:00
badlogic
5d3d681d6f [c] Closes #698, closes #704. Don't set locale on Android, use _strdup instead of strdup on WIN32 2016-09-26 11:55:14 +02:00
badlogic
3456073765 [c] Closes #698, locale reset was still wrong. Thanks @FrankStain. 2016-09-13 11:26:24 +02:00
badlogic
684f6dcf3e [c] Closes #690, resetting old locale should work now 2016-09-05 14:49:10 +02:00
badlogic
65a6d37f5a [c] Closes #686, reading weighted path vertices set the wrong vertexCount on the path attachment 2016-09-05 14:43:17 +02:00
mogemimi
84ab430dee [c] Fix variable shadowing warning (#684) 2016-08-25 10:14:20 +02:00
NathanSweet
94dcbf4125 [c] Reverted vertexCount sanity. badlogic was right, it's more complex than it seems! See #669 2016-08-10 19:48:52 +02:00
NathanSweet
942cf272fa [c] Sanity for vertexCount. 2016-08-10 18:13:38 +02:00
badlogic
11941cfe0b [c] Proper fix for #666, VertexAttachment#verticesCount means #vertices for box and path attachment, but means something else for mesh attachments. 2016-08-10 11:15:48 +02:00
badlogic
5784a46512 [c] Vertex count is more complicated than thought, reverted last commit 2016-08-10 11:09:29 +02:00
badlogic
8fbe0ccd07 [c] Closes #666 (number of the beast), vertex count for non-weighted meshes was incorrect 2016-08-10 11:07:47 +02:00
Borislav Stanimirov
0bb60cfb52 [spine-c] Fixed calculation of number of path constraint timelines.
* The json structure is that the path constraint timelines are added per path constraint
* Instead of the number of timelines what was calculated was the number of path constraints for which we have timelines
* If there were more timelines than path constraints, this led to memory corruption (writing past the buffer)
2016-07-19 12:49:16 +03: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
d5228d2549 Fixed having > 8 linked meshes. 2016-06-10 20:12:20 +02:00
NathanSweet
506dc49d8a Fixed spAttachmentLoader_configureAttachment being called too soon for linked meshes. 2016-04-21 16:15:40 +02:00
NathanSweet
421789e6f7 spine-c updated to v3.1. 2016-04-15 12:21:22 +02:00
NathanSweet
f59e461230 Only need to keep around attachment loader if attachment->attachmentLoader is set. 2016-04-02 15:32:05 +02:00
NathanSweet
9a404e5c49 AttachmentLoader now has create, configure, dispose.
Now the attachment loader should not be disposed until loaded attachments are disposed.
2016-04-02 15:23:15 +02:00
NathanSweet
0f723b9fa7 A few fixes and minor improvements. 2016-02-17 03:52:22 +01:00
NathanSweet
10c941a28b Missed porting.
#519
2016-02-17 01:04:43 +01:00
NathanSweet
d7d08d263a Updated spine-c and spine-sfml to Spine v3. 2016-02-16 00:14:07 +01:00
NathanSweet
d8d5405ba3 Fixed JSON parsing for all locales.
http://esotericsoftware.com/forum/Spine-c-runtime-strtod-Problem-5380
2015-11-03 03:03:27 +01: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
Piotr Paczkowski
4c0321626b Fix buffer overflow when JSON Skeleton produces Error 2015-01-17 00:03:05 +01:00
Nathan Sweet
5abfbe1200 Merge pull request #321 from ubiyf/master
Fix Bug : Can not build android apk, if not set char* as const.
2014-11-14 00:06:22 +01:00
beik
69fe56b329 load flipX flipY from json 2014-11-10 11:52:57 +08:00
ubiyf
879ae91c25 Fix Bug : Can not build android apk, if not set char* as const
Can not build android apk, if not set char* as const
2014-11-07 15:39:54 +08:00
jpoag
b7868c0f73 [Spine-C] retain hash and version strings 2014-10-26 12:58:48 -04:00
jpoag
eb1e303017 [Spine-C] retain hash and version strings 2014-10-26 12:49:26 -04:00
NathanSweet
1323770033 Fixed ANSI C compilation. 2014-10-06 14:01:32 +02:00
NathanSweet
22b2086f39 Flip for bones. Flip timelines now affect bones. "draworder" in JSON -> "drawOrder".
Falls back to "draworder" to not break existing JSON (for the time being).
2014-10-04 13:01:52 +02:00
NathanSweet
6ce7a62245 spine-c, added flip timelines. 2014-10-02 18:46:31 +02:00
NathanSweet
6f0343d183 Fixed long->int warnings. 2014-10-01 17:03:13 +02:00
NathanSweet
ecab41ab8b Fixed bend direction for IK keys. 2014-09-02 13:02:15 +02:00
NathanSweet
0c3e74123e Fixed loading IK keys. 2014-09-01 16:14:27 +02:00
NathanSweet
b327a803e0 C89 fixes. 2014-08-31 16:21:52 +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
NathanSweet
a62b1ff0f2 Warning. 2014-05-18 21:51:42 +02:00
NathanSweet
72a4ad4cc1 Minor refactoring. 2014-05-14 21:49:15 +02:00
NathanSweet
5848973f0b Hull length is int. 2014-05-08 17:38:31 +02:00
NathanSweet
99a8de4bb4 FFD for spine-c and spine-sfml. 2014-04-29 20:28:27 +02:00
NathanSweet
23d4d0558c Fixed bug loading skinned meshes. 2014-04-29 00:48:12 +02:00
NathanSweet
e782b6effa Cleaning up. 2014-04-29 00:31:24 +02:00
NathanSweet
b1f851a246 Meshes, FFD and skinning for spine-c.
Untested since rendering hasn't yet been done for a runtime that extends spine-c.
2014-04-28 17:52:01 +02:00
NathanSweet
a180398975 Added SP_ prefix to enums.
Super fun. Don't forget you can use SPINE_SHORT_NAMES.
2014-04-27 23:23:13 +02:00