70 Commits

Author SHA1 Message Date
pharan
5d78359b7c [csharp] Limit linked list by speeding up, see 0f944b2baf 2017-05-18 09:11:42 +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
badlogic
7af22538e2 [csharp] Ported AnimationState change 2017-04-10 15:48:54 +02:00
John
facae4cb12 [csharp] Match fewer ifs for mixAlpha fix.
f8ea8e99ca
2017-04-07 23:11:13 +08:00
John
b7b173d1ec [csharp] Port dipping problem fix
https://github.com/EsotericSoftware/spine-runtimes/issues/867
2017-04-06 23:54:43 +08:00
badlogic
cbe79ba04a Merged master manually 2017-02-23 14:39:36 +01:00
John
cee79b7beb [csharp] Allow events queued within callbacks. 2017-02-18 15:28:02 +08:00
pharan
3736a5c3dc [csharp] Ported 3.6-beta changes. 2017-01-28 23:20:23 +08:00
John
dc8f89fd65 [csharp] Fix recursion in clearTracks.
Issue: https://github.com/EsotericSoftware/spine-runtimes/issues/805
based on f6cf88103c and 7dbf7c5268
2016-12-15 05:58:49 +08:00
badlogic
14f9d28d06 [csharp] Ported latest AnimationState changes, see c512ee5d595076842cbb12d95a3a7f06792b81d1 2016-12-06 13:53:25 +01:00
John
3884422543 [csharp] AnimationState TrackEntry pooling. 2016-12-02 18:48:39 +08:00
John
896abf8fd7 [csharp] AnimationState fixes.
Includes fix: a6ac746b4f
2016-12-02 02:10:42 +08:00
John
c1353efdd3 [csharp] Better rotation direction reset.
Based on 6af978871b
2016-11-29 01:42:02 +08:00
badlogic
9c1b5b209a [csharp] Ported latest AnimationState changes 2016-11-28 16:46:14 +01:00
pharan
abb1b013a5 [csharp] AnimationState fixes. 2016-11-24 02:42:37 +08:00
pharan
25c2ca7b1b [csharp] UpdateMixingFrom fixes. 2016-11-23 22:11:47 +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
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
9a7aeb1ae0 Merge pull request #344 from pharan/patch-1
[C#] Optional fix for firing events when mixing


This allows previous animations to fire its events during mixing/crossfading.

To maintain consistency across runtimes, this fix code is commented out.
To use it, remove the old line and uncomment the fix line.
2015-12-25 23:15:27 +08:00
John
f2e8340a24 Optional fix code for events during mixing
To maintain consistency across runtimes, this fix code is commented out.
To use it, remove the old line and uncomment the fix line.
2015-12-25 23:11:34 +08: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
0635c19fef replace some more List<T> with ExposedList<T>
fix some stupidity from previous commit
2015-02-26 05:37:28 +02:00
John
22e283ac6c AnimationState.cs now fires events during mixing
Not sure if the same "fix" needs to be applied to other runtimes, or if this was intended behavior at all. But someone in the forums was looking for this fix.
2015-01-20 01:01:52 +08:00
NathanSweet
14c8484caa Fixed null check. 2014-11-20 11:40:18 +01:00
NathanSweet
8dc8f8f9e8 Added null checks for add/set animation.
closes #173
2014-11-19 18:02:14 +01:00
NathanSweet
07d92bfde4 Updated line ending so Unity stops complaining. 2014-05-17 14:37:08 +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
df70264a5b Go back to clearing the entry after the "end" listeners.
Changing the AnimationState state from an "end" listener is problematic even when the entry is cleared before the listener, so better to make the track that is ending available to the listener.
2014-03-17 16:53:33 +01:00
NathanSweet
f0e4b5e9b8 Fixed AnimationState error. 2014-03-13 16:19:54 +01:00
NathanSweet
aff250daf4 Allow a track to mix with the track below.
http://esotericsoftware.com/forum/viewtopic.php?f=7&t=2248
2014-03-09 12:06:36 +01:00
NathanSweet
211f82fedd Clear the track before calling end on the listener. 2014-03-08 00:20:26 +01:00
NathanSweet
66a336e219 Adjusted line endings. 2014-02-05 18:09:16 +01:00
John
c5bc9a3cf4 AnimationState C# events subscription
Using the "event" keyword DOESN'T require the use of EventArgs derived classes as part of the method signature.

Events provide a (standard) layer of safety by preventing the nulling or complete reassignment.
It restricts external class interaction with the event to subscription with the += operator and unsubscription with the -= operator. This prevents unrelated objects from accidentally unsubscribing other objects from the event.

The null check is still required though.

For people who followed the examples, worked with the original events and only used += to subscribe to events, this change shouldn't affect client code at all.
2014-01-31 18:36:41 +08:00
John
7699e9b28f Fixed "CompleteDelete" typo in C# event delegates
Supposed to be "CompleteDelegate"?
2014-01-31 01:33:46 +08:00
NathanSweet
4216077c0e Better AnimationState event delegates. 2014-01-26 21:08:09 +01:00
NathanSweet
68d829556a Added getter for tracks.
http://www.esotericsoftware.com/forum/viewtopic.php?f=7&t=1982
2014-01-26 16:46:30 +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
71956544ba Mix from closest animation if setting an animation during a mix. 2014-01-06 21:33:58 +01:00
NathanSweet
a9315d46f3 Fixed animation state delay when not set right away. 2013-10-22 11:41:57 +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
3a1aac897c Better delay adjustment. 2013-10-17 01:13:22 +02:00
NathanSweet
c25809fa4f When delay is <= 0 use remaining time, not just duration.
http://www.esotericsoftware.com/forum/viewtopic.php?f=7&t=1447
2013-10-16 11:04:29 +02:00
NathanSweet
f3be613429 Fixed clearing tracks in event callbacks. 2013-10-10 18:49:16 +02:00
NathanSweet
97f9b7e4d2 Fixed clearing tracks in event callbacks.
closes #134
2013-10-10 10:15:53 +02:00