1880 Commits

Author SHA1 Message Date
NathanSweet
e0ee18a088 Fixed single bone IK mixing. 2016-06-25 22:13:31 +02:00
NathanSweet
a9a771ba1c Removed old attachment types. 2016-06-24 14:50:22 +02:00
NathanSweet
ebab0c6ca7 Merge remote-tracking branch 'origin/master' 2016-06-23 22:56:43 +02:00
NathanSweet
39da610005 Used constants. 2016-06-23 22:54:33 +02:00
Mario Zechner
a98f76f13f Update README.md 2016-06-22 21:20:14 +02:00
Mario Zechner
1b9705388f Merge pull request #618 from Shiu/patch-1
Update README.md
2016-06-22 21:14:52 +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
71b3484062 Clean up. 2016-06-22 12:55:36 +02:00
NathanSweet
e834982b49 Updated READMEs for v3.3 support. 2016-06-20 19:26:05 +02:00
NathanSweet
d506478479 Method is package private for editor access. 2016-06-20 19:25:46 +02:00
NathanSweet
eded12cd52 Removed hardcoded paths.
Oops, sorry!
2016-06-20 19:25:29 +02:00
NathanSweet
9a469c0460 Prettier with varargs. 2016-06-18 21:57:26 +02:00
NathanSweet
9ff1d11e1b Merge remote-tracking branch 'origin/master' 2016-06-18 19:16:15 +02:00
NathanSweet
f961c127f6 Added coverting linkedmesh to weightedlinkedmesh. 2016-06-18 19:16:02 +02:00
Matthew
db2190e7db [LUA] AnimationState trackCount bugfixes (#466)
* resolved conflict

* made trackCount keep count, not maximum track index.
2016-06-17 20:11:41 +02:00
NathanSweet
8239b2f905 Merge remote-tracking branch 'origin/master' 2016-06-17 12:24:42 +02:00
NathanSweet
2f846cfba5 Added JsonRollback, a tool for converting newer JSON so it can be loaded by an older Spine version. 2016-06-17 12:24:38 +02:00
NathanSweet
b41d85a692 Added context when exceptions are thrown during attachment and animation parsing. 2016-06-17 12:21:32 +02:00
John
21b8a03ccd [Unity] Update BoneFollower 2016-06-17 18:17:57 +08:00
pharan
16011c2eb1 [Unity] Update BoneFollower 2016-06-16 15:44:46 +08:00
NathanSweet
db1afae89a Merge remote-tracking branch 'origin/dev' 2016-06-15 20:18:29 +02:00
John
c311a5aa2e [Unity] Fix SkeletonUtility debug bone scale. 2016-06-12 10:39:15 +08:00
NathanSweet
534ffc8d1d Back to constant speed.
It's better.
2016-06-12 03:55:59 +02:00
NathanSweet
021dfe288b Renamed constant speed to accurate. 2016-06-11 05:04:43 +02:00
mogemimi
fc8505ff81 Fix -Wshadow warning when compiling with Clang (#607) 2016-06-10 23:41:23 +02:00
NathanSweet
d5228d2549 Fixed having > 8 linked meshes. 2016-06-10 20:12:20 +02:00
John
5cceb22406 [unity/tk2d] Update editor code. Some cleanup and fixes. (#608)
* Initial cleanup and review.

* More cleanup and review.

* Removed missing atlas warnings for TK2D. Better button labels. Separated specialized/utility shaders.

* Clearer wording. More checks.

* Fix for Inspector reflowing between GUI events.

* Basic TK2D warning message.

* Fix play buttons. Removed useless reimport button for TK2D. Minor fixes.
2016-06-10 16:40:10 +08:00
NathanSweet
ae4ac8210f Check default skin, fixed crash. 2016-06-10 04:14:19 +02:00
NathanSweet
92d7ef32f4 Multiple constrained bones for transform constraints. 2016-06-10 03:21:54 +02:00
NathanSweet
8b3b0169ad Added Slot#getIndex. 2016-06-10 00:27:56 +02:00
NathanSweet
52545f262b Fixed update order for path weights.
Not super happy with having to do this, but it seems necessary.

badlogic/spine-internal#72
2016-06-10 00:27:46 +02:00
NathanSweet
8d19504bd7 Fixed binary path loading. 2016-06-09 19:31:05 +02:00
NathanSweet
07bb307b72 Fixed loader scale for paths. 2016-06-09 18:22:23 +02:00
NathanSweet
40950eded7 JSON and binary path attachment and constraint loading. 2016-06-09 03:33:48 +02:00
NathanSweet
a6ccff5fde Better path debug rendering. 2016-06-09 03:33:14 +02:00
NathanSweet
3511d7664b Fixed path constraint crash. 2016-06-08 16:19:49 +02:00
NathanSweet
b3f84390c5 Separate path timelines. 2016-06-07 13:15:08 +02:00
John
2a6e2b8dfc Add missing setup value for TransformConstraint. 2016-06-07 11:12:27 +08:00
NathanSweet
b41dead263 Path constraint refactoring + position mode. 2016-06-06 17:29:44 +02:00
NathanSweet
66b7581516 Clean up. 2016-06-06 14:13:53 +02:00
olssonfredrik
1f4b6b1508 Fixed a bug where ffd would never be used. (#602)
Float32Array.length is read only and will not resize the array. This caused the .length to always be 0 and thus not use ffd in spine.WeightedMeshAttachment.computerWorldVertices(). This proposed fix instead creates a new array when the size has changed.
2016-06-06 14:13:58 +02:00
NathanSweet
2bb702e2be BOZO removal. 2016-06-06 12:38:01 +02:00
NathanSweet
932808bd06 Minor improvements.
Think she's done! Just need 3 path timelines.
2016-06-06 11:52:49 +02:00
NathanSweet
5cfa647ce2 Added path constraint spacing, spacing mode, rotate mode. 2016-06-06 11:30:50 +02:00
NathanSweet
b3fdaca019 Fixed child IK bone not being updated when IK mix = 0. 2016-06-05 01:44:35 +02:00
NathanSweet
7729d423f7 Improved non-constant speed paths. 2016-06-05 01:36:32 +02:00
NathanSweet
633432647b Clean up, optimization. 2016-06-05 00:58:07 +02:00
NathanSweet
3d8b674444 Removed appliedScaleX/Y.
These existed because TransformConstraint used to manipulate the local transform. Now that it manipulates the world transform, they aren't used.
2016-06-05 00:57:49 +02:00