1914 Commits

Author SHA1 Message Date
NathanSweet
14db99eea8 Updated examples. 2016-07-06 16:38:24 +02:00
NathanSweet
9a310a9d24 [libgdx] Removed path/tank/test skeletons. 2016-07-06 15:54:59 +02:00
NathanSweet
005861c242 [c] Fixed unused warning. 2016-07-06 12:16:29 +02:00
badlogic
a86681a909 Merge branch 'master' of https://github.com/esotericsoftware/spine-runtimes 2016-07-06 12:17:12 +02:00
badlogic
ef3041a84b [c] Fixed SIN_DEG/COS_DEG 2016-07-06 12:17:03 +02:00
NathanSweet
4f05341f4c [libgdx] Can resurrect later. 2016-07-06 12:06:29 +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
c7b6966055 [spine-unity] Better BoneFollower editor warnings. 2016-07-05 16:12:21 +08:00
pharan
94df4cb5be [spine-unity] Fix SkeletonDataAsset inspector error on recompile. 2016-07-05 15:22:11 +08:00
John
ccb9303681 [spine-unity] Fixed linked weighted meshes. 2016-07-05 06:11:20 +08:00
John
bde07221b3 [spine-unity] Fix SkeletonGhostRenderer namespace. 2016-07-05 05:15:17 +08:00
pharan
ebd8831a17 [spine-unity] 3.3 changes to TK2D code + better default scale. 2016-07-04 13:58:34 +08:00
NathanSweet
fca7c478e2 [spine-libgdx] Fixed Skeleton copy constructor. 2016-07-04 02:13:45 +02:00
NathanSweet
0a08704ee8 [spine-csharp] Removed whitespace. 2016-07-04 02:13:23 +02:00
NathanSweet
5c9b1f30eb [spine-csharp] Minor clean up. 2016-07-04 00:51:44 +02:00
NathanSweet
50433bb4a0 [spine-csharp] Minor clean up. 2016-07-04 00:42:40 +02:00
John
f1730b2b38 [csharp] Fixed missing paren. 2016-07-01 23:44:39 +08:00
NathanSweet
9f15d1be4a Merge remote-tracking branch 'origin/master' 2016-07-01 17:19:30 +02:00
NathanSweet
3bb34eb9f9 Updated examples with binary data and PMA and non-PMA atlases. 2016-07-01 17:19:18 +02:00
Mario Zechner
eaccc10035 Merge pull request #625 from Hinidu/fix-bone-iter
[csharp][libgdx] fix iterating bones in VertexAttachment.ComputeWorldVertices.
2016-07-01 11:47:59 +02:00
Pavel Platto
70b3e0f86f [csharp][libgdx] fix iterating bones in VertexAttachment.ComputeWorldVertices.
Postincrement affects its variable only when entire expression is evaluated.
2016-07-01 11:21:14 +02:00
badlogic
4e49723cd4 [spine-csharp] Fixed ColorTimeline parsing 2016-07-01 09:55:31 +02:00
NathanSweet
a39df63fd0 Updated a few example projects to 3.3.07. 2016-06-30 23:49:26 +02:00
NathanSweet
1b16e521ca [csharp, monogame, xna] Updated copyright info. 2016-06-30 23:49:09 +02:00
NathanSweet
1c717e2d44 Added example projects and exports. 2016-06-30 15:43:15 +02:00
John
1c19365325 [csharp][monogame][unity][xna] Updated to 3.3.x (#623)
* [spine-csharp] Ported 3.3 changes of Animation and inner classes. Added MathUtils.Clamp

* [spine-csharp] Ported 3.3 changes of AnimationStateData. Updated .gitignore to exclude .meta files from spine-csharp

* [spine-csharp] Ported 3.3 changes of Bone

* [spine-csharp] Ported 3.3 changes of BoneData

* [spine-csharp] Ported 3.3 changes of Event

* [spine-csharp] Ported 3.3 changes to IKConstraint. Also got rid of the hideous labeled break. Replaced with while and sprinkled continues and break :D

* [spine-csharp] Mario is not good with labeled breaks. Fixed with goto

* [spine-csharp] Ported more 3.3 changes, only SkeletonJson and SkeletonBinary left. Unity runtime also needs updating with new changes

* [spine-csharp] fixed compilation errors initially not reported by Mono CS

* Minor clean up.

Every space has its place.™

* Match csharp 3.3 refactorings.

* [Unity] Minor cleanup in SkeletonBaker.

* Better exception messages.

* Removed extra usings. Matched whitespace style.

* Fixed Bone.cs method PascalCase and xml documentation.

* Fixed Exception ctor arguments.

* Fixed single bone IK mixing.

Matched libgdx commit:
e0ee18a088

* [spine-csharp] Port of 3.3 changes to SkeletonJson, incomplete

* [Unity] Ragdoll: account for shear and new constraints.

* [spine-csharp] Ported 3.3 changes to SkeletonJson

* [spine-csharp] Ported 3.3 changes to SkeletonBinary. Time for testing and debugging

* [spine-csharp] Fixed up XNA runtime

* Added simple example data in new exports/ folder

* [spine-csharp] Fixed bug in Slot construtor, wasn't assigning index. Fixed bug in CurveTimeline, argument guard was wrong. Fixed bugs in SkeletonJson, indexing to get duration of a timeline was wrong. Added simple example to spine-xna for easier debugging

* [spine-csharp] Fixed porting bug in ColorTimeline#apply, indexing was wrong

* [spine-csharp] Fixed SkeletonJson#ReadVertices, calling resize on temp lists was wrong. Updated goblin sample in spine-xna, fixed mesh attachment rendering in spine-xna.

* [spine-xna] Added binary exports, modified XNA game

* [spine-xna] Added tank example

* Some cleanup. Relabeled generic todos.

* Prevent SpineEditorUtilities from orphaning failed instantiations.

* Ignore PathAttachment when checking for required atlas regions.

* [spine-csharp] the great spaces to tabs battle

* [spine-csharp] Fixed inherit deform.

* [spine-csharp] Match Skeleton.java properties and stuff.

* [spine-csharp] Fixed enums, all upper cased now, using Enum.ParseType in case-insensitive mode

* [csharp] Ported 206e7f983c4df4d27fee6cac05d152eb2295c8b0 to csharp runtime. Fixes attachment keys on different tracks

* [csharp] Updated README.md

* [xna] [monogame] [unity] Updated README.md

* Revert "[csharp] Ported 206e7f983c4df4d27fee6cac05d152eb2295c8b0 to csharp runtime. Fixes attachment keys on different tracks"

This reverts commit 175216868dd00b4ae31cc717022242308c150f6a.

* [csharp] Fix to AttachmentTimeline#apply, fix for the fix for the fix for the revert for the fix

* [csharp] Matched and fixed more comments, summaries, exception messages and formatting.

* [csharp] Fix deformed weighted vertices condition + match libgdx closer.

* [csharp] Use internal ExposedList array for critical methods.

* [csharp] SkeletonJson and SkeletonBinary minor formatting and fixes.

* [unity] Match changes and fixes in spine-csharp 3.3 + better editor messages.

* [unity] Updated sample scenes and files.

* [csharp] Some formatting got left behind.

* [unity] New readme links + Removed redundant info.

* [exports] Remove dummy project.
2016-06-30 04:29:33 +08:00
NathanSweet
20460fbdaa [libgdx] Fixed incorrectly scaling transform constraint offsets. 2016-06-29 02:14:44 +02:00
NathanSweet
4c82899115 [libgdx] Removed deferred attachment lookup.
3rd try is a charm. Don't code tired!
2016-06-28 17:37:43 +02:00
NathanSweet
5c363f0cc1 [libgdx] Removed deferred attachment lookup. 2016-06-28 17:29:38 +02:00
NathanSweet
5951e9f6b2 [libgdx] Removed deferred attachment lookup. 2016-06-28 17:28:16 +02:00
NathanSweet
206e7f983c Fixed attachment keys on different tracks.
badlogic/spine-internal#49

(cherry picked from commit 6cccbf61f3bd9f125958fac6eb120b839ae82738)
2016-06-26 20:31:23 +02:00
NathanSweet
ac00899175 Merge remote-tracking branch 'origin/master' 2016-06-25 22:13:36 +02:00
NathanSweet
e0ee18a088 Fixed single bone IK mixing. 2016-06-25 22:13:31 +02:00
John
64aa883486 [Unity] Remove buggy fog from default shader. 2016-06-25 02:05:27 +08:00
Denis Novozhilov
290538752a [Unity] Fix SpriteAttacher for pivots outside sprite.
The case here is as follows:
 - create random unity sprite prefab
 - place sprite's pivot point outside of the sprite (say, pivot U is 2.53 and pivot V is -1.22)
 - try to attach this sprite via the SpriteAttacher script

Expected result here would be seeing the sprite sticking with it's pivot point to the placeholder.
Actual result here looks like the sprite's pivot point is somewhere in U: 1 and V: 0.

The bug is caused by Mathf.InverseLerp - it just cannot return values outside of [0; 1] range.

So the solution would be to make our own version of InverseLerp, which handles such situations correctly.
2016-06-25 00:10:08 +08: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