64 Commits

Author SHA1 Message Date
pharan
14d031cb78 [csharp] Added shifted vertex attachment IDs for DeformTimeline. 2017-06-11 00:38:38 +08:00
John
3c194a5c9d [csharp] Fixed deform timelines not mixing to/from setup pose.
ef6ccb84d3
2017-06-02 21:59:45 +08:00
pharan
eacb73c913 [csharp] Ported animation state changes, see https://github.com/EsotericSoftware/spine-runtimes/issues/904 2017-05-18 07:17:41 +08:00
pharan
7938375067 [csharp] Matching and cleanup. 2 of 2 2017-02-24 21:12:21 +08:00
pharan
3736a5c3dc [csharp] Ported 3.6-beta changes. 2017-01-28 23:20:23 +08:00
pharan
ece4e93118 [csharp] Fix and cleanup a few typos. 2016-11-19 06:35:00 +08:00
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
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
John
f1406e2f85 Update spine-csharp to v3.2 (shearing) (#562)
* spine-csharp updated to 3.2.00.

* Some cleanup, catchup and fixes.

* Mix transform constraint scale and shear offsets.

* Update readmes.

* Clean up.

* Formatting.

* Fixed single bone IK with nonuniform scale. Improved two bone IK.
2016-06-01 02:25:30 +02:00
NathanSweet
7823833bb4 Minor clean up. 2016-04-13 21:14:59 +02:00
John
ba5e4073c3 Updated spine-csharp to 3.1.05: linked meshes. (#543)
* Updated spine-csharp to 3.1.00: linked meshes.

* Updated SkeletonBinary.cs for 3.1.05

based on:
3a06b829cc
8c55aa1f62

* Fixed skeleton flip when rotation and scale are disabled.

Based on: b22669711d

* Fixed IK when the parent has nonuniform scale and the child Y != 0.

Based on: bf902936aa

* Removed redundant locals.
2016-04-13 17:10:20 +02:00
John
27bab7bb95 Don't mix from uninitialized slot vertices.
One less and more correct check.
2016-03-29 07:26:57 +08:00
John
17ba6e2354 Don't mix from uninitialized slot vertices. 2016-03-29 05:03:43 +08:00
NathanSweet
10c941a28b Missed porting.
#519
2016-02-17 01:04:43 +01:00
NathanSweet
03606717a7 Fixed whitespace.
C# has such bad tools. :(
2016-02-15 21:03:49 +01:00
NathanSweet
08b74f5b18 Updated spine-csharp to Spine v3. 2016-02-14 22:51:18 +01:00
ZimM
4057316a91 Merge remote-tracking branch 'remotes/upstream/master' into optimizations 2015-06-29 19:07:39 +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
d0625e06a0 Added binary format support for C#.
Also fixed up line endings.
2015-03-29 00:49:31 +01:00
ZimM
0635c19fef replace some more List<T> with ExposedList<T>
fix some stupidity from previous commit
2015-02-26 05:37:28 +02:00
ZimM
9ae48c2aac replaced List<T> with ExposedList<T> to avoid indexer overhead 2015-02-26 05:00:44 +02:00
Fenrisul
c5273fc6d7 Added GetCurveType to CSharp CurveTimeline 2015-02-02 05:44:17 -08:00
NathanSweet
ee849c62eb Fix mixing from uninitialized slot vertices. 2015-01-30 15:40:13 +01:00
NathanSweet
7b3bc205fd Minor clean up. 2014-11-16 03:06:08 +01:00
NathanSweet
ee1f13ab9c Don't clear FFD if before first FFD key in animation.
Didn't make any sense. Any existing FFD should remain until time passes a key.
2014-11-16 00:13:37 +01:00
NathanSweet
31848ad22a Minor clean up. 2014-11-16 00:09:37 +01:00
NathanSweet
322d8ed0ab Fixed first flip key not being applied. 2014-11-11 17:42:19 +01: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
08a680c972 spine-unity, added flip timelines. 2014-10-02 18:09:38 +02:00
NathanSweet
53437a6159 Fixed FfdTimeline for spine-c. 2014-10-01 01:31:52 +02:00
NathanSweet
57f24ff8cc Clean up. 2014-09-30 01:27:41 +02:00
NathanSweet
e5d3d380c7 Fixed AttachmentTimeline from missing first key.
http://esotericsoftware.com/forum/viewtopic.php?p=16600#p16600
2014-09-27 01:02:57 +02:00
NathanSweet
7aadd9bce7 Variable naming, "previous" rather than "last". 2014-09-24 16:16:57 +02:00
NathanSweet
3ed7fb6865 Changed how scale is applied.
Scale is now multiplicative, as it was intended to be.
http://esotericsoftware.com/forum/viewtopic.php?p=16259#p16259
This change means skeletons need to be exported again using Spine 2.0.00+.
2014-09-24 16:14:42 +02:00
NathanSweet
37f332d149 Fixed IK constraint bend direction keys. 2014-09-24 15:37:12 +02:00
NathanSweet
e6e7f0bd5d IK constraints for spine-csharp. 2014-08-30 17:04:13 +02:00
NathanSweet
7f6abc8c00 Fixed mixing from uninitialized slot vertices.
http://esotericsoftware.com/forum/viewtopic.php?f=9&t=2775
2014-06-03 18:37:42 +02:00
NathanSweet
01c0e1881f Minor changes. 2014-05-21 22:28:50 +02:00
NathanSweet
5b68fe5190 Meshes, FFD and skinning for spine-csharp and spine-xna.
Also updated example projects for spine-unity and spine-tk2d, but no meshes, FFD or skinning for those two yet.
2014-04-24 17:32:23 +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
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
6be3dbb7ed Fixed spine-csharp. 2013-10-20 22:37:03 +02:00
NathanSweet
af5ff6c11f Fixed events not firing sometimes.
http://www.esotericsoftware.com/forum/viewtopic.php?f=9&t=1462
2013-10-20 12:18:01 +02:00
NathanSweet
9a347d5eb8 Updated license.
Nailed it this time, quite sure!
2013-10-04 04:13:09 +02:00
NathanSweet
748431b4f6 Allow null firedEvents. 2013-10-03 21:32:57 +02:00
NathanSweet
981e7a1371 Fixed last event being fired too many times. 2013-10-03 20:33:03 +02:00