54 Commits

Author SHA1 Message Date
badlogic
1ad8e6b63c Merged with master, resolved conflicts 2017-03-02 13:04:44 +01:00
John
d7d6177372 [csharp] Fix disabled inheritance when yDown==true (#834)
http://esotericsoftware.com/forum/Flipped-bones-during-runtime-using-XNA-sample-project-7873
2017-02-28 04:23:09 +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
NathanSweet
36000e3c55 Updated to v3.5 (merge dev branch).
# Conflicts:
#	spine-c/src/spine/AnimationState.c
2016-11-15 23:10:23 +01:00
pharan
a05ee4130f [csharp][unity][monogame][xna] Updated for compatibility with Spine 3.5.x 2016-11-01 23:46:47 +08: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
6616ec1808 [csharp] Fixed world scale.
6cc91d579c
2016-08-19 11:13:23 +08: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
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
NathanSweet
6c353c1a38 Fixed worldToLocal.
closes #544
2016-04-03 18:30:35 +02:00
NathanSweet
d93e1507fc Fixed disabling scale/rotation.
closes #525
2016-02-22 10:18:16 +01:00
NathanSweet
0f723b9fa7 A few fixes and minor improvements. 2016-02-17 03:52:22 +01:00
NathanSweet
b72d915036 Better yDown support. 2016-02-15 23:56:00 +01:00
NathanSweet
03606717a7 Fixed whitespace.
C# has such bad tools. :(
2016-02-15 21:03:49 +01:00
NathanSweet
ac2721c553 Fixed flipping to use world axes, fixed disable inherit scale and rotation when flipped. 2016-02-15 02:43:04 +01:00
NathanSweet
08b74f5b18 Updated spine-csharp to Spine v3. 2016-02-14 22:51:18 +01:00
NathanSweet
91340709d4 Source formatting.
So fresh and so clean!
2015-08-03 15:06:20 +02: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
ZimM
9ae48c2aac replaced List<T> with ExposedList<T> to avoid indexer overhead 2015-02-26 05:00:44 +02:00
NathanSweet
31848ad22a Minor clean up. 2014-11-16 00:09:37 +01:00
NathanSweet
14aeb49650 Clean up. 2014-10-04 13:36:05 +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
57f24ff8cc Clean up. 2014-09-30 01:27:41 +02:00
Fenrisul
f643dab32d Fixed accidental remerge 2014-09-04 05:39:08 -07:00
Fenrisul
0fa4aad44d Modified Bone.cs
Removed IEnumerable interface
Added public Children getter for children List
2014-09-04 05:37:06 -07:00
Fenrisul
14219d8462 Added children List<Bone> to Bone.cs and populated it inside Skeleton.cs
Changed Bone class to implement IEnumerable to easily traverse the child list.
2014-09-04 03:56:10 -07:00
NathanSweet
2cfb6ad980 Moved Skeleton refernce from Slot to Bone. 2014-08-31 12:47:04 +02:00
NathanSweet
e6e7f0bd5d IK constraints for spine-csharp. 2014-08-30 17:04:13 +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
2b241c3628 Fixed root bone translation.
Again.
2014-01-17 00:58:29 +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
63f20379db Better root flipY logic. 2013-12-05 14:52:34 +01:00
NathanSweet
719e09d443 Fixed root translation with yDown coordinates.
http://www.esotericsoftware.com/forum/viewtopic.php?f=9&t=1657
2013-11-30 16:01:57 +01: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
832b0f02aa C# style method and class docs.
closes 127
2013-09-27 14:48:54 +02:00
NathanSweet
60ac4d7533 Don't use properties internally.
Mono is slower using properties.
2013-09-23 20:25:15 +02:00
NathanSweet
e2fccf72d6 License update.
Changed from New BSD to a custom license. The new license requires a Spine license to use the code. If you have a valid Spine license, you can do whatever you like with the code. This should not be a problem for anyone using the runtimes with Spine, nothing changes. If using the runtimes without a Spine license, you now need a Spine license. This is because the runtimes were created explicitly to be used with Spine.
2013-09-20 19:46:23 +02:00
NathanSweet
0784725106 Merge branch 'origin/master' 2013-08-02 15:09:06 +02:00
Borislav Kosharov
9408033356 Combined two similar ifs to one with xor 2013-08-02 14:01:43 +03:00
NathanSweet
e6d7cf8b26 Add x and y to skeleton for positioning instead of using root bone. 2013-05-28 18:17:55 +02:00
NathanSweet
1f8cad35eb Fix up property name case. 2013-05-28 17:52:34 +02:00
John Dy
6c784ec0cd Added bone inherit rotation and scale in csharp
Just mimicked the changes in spine-libgdx and your code pattern in c#.
Working fine in Unity.
2013-05-27 16:45:40 +08:00
NathanSweet
3736352c09 Fixed flip x/y for root bone. (reverse-merged from commit 64fd34ba9426e2c7637526b1029721000c14ad5b)
#43
2013-05-08 13:01:10 +02:00