97 Commits

Author SHA1 Message Date
pharan
053456d893
[csharp] AnimationState holdPrevious (fixed). 2018-09-10 19:21:02 +08:00
pharan
01564c622a
[csharp] Revert holdPrevious AnimationState change 2018-09-10 15:59:40 +08:00
pharan
2d7f26a21c
[csharp] Fix and match AnimationState port. 2018-09-09 18:24:09 +08:00
pharan
068559e6cb [csharp] TrackEntry holdPrevious. See #1169 2018-09-06 21:38:30 +08:00
pharan
671c921089
[csharp] Fix rotation spinning out of control.
Port of: 7996f2b
2018-08-17 23:19:49 +08:00
John
9589d4225e
[csharp] Fix events firing during mix out.
Based on 2a7fd54224
2018-06-01 19:04:17 +08:00
badlogic
b60f21e6d8 Merge branch '3.6' into 3.7-beta 2018-05-17 13:44:53 +02:00
John
df45ae9d22
[csharp] Use explicit primitive declaration. 2018-05-17 03:55:35 +08:00
badlogic
eb69071a0a Merge branch '3.6' into 3.7-beta 2018-05-16 11:46:01 +02:00
badlogic
0ad0fc4de8 [csharp] Fixes completion event firing for 0 duration animations. See #1112. 2018-05-16 11:42:19 +02:00
John
c956bb4bc9
[csharp] Fixed AddAnimation.
Port of a961b41a9c.
See: https://github.com/EsotericSoftware/spine-runtimes/issues/1092
2018-03-28 18:37:33 +08:00
pharan
b4c8deb283 [csharp] Animation and AnimationState 3.7 2018-01-19 05:34:20 +08:00
badlogic
d029d19a3e [csharp] Fix for #1064, delay was calculated incorrectly for non-loop previous track entries. 2018-01-12 11:18:54 +01:00
John
ed8f238524
[csharp] Removed bad fix for #1024
based on 1514b4acbb (diff-2e690293d0fea3104ddda07be1d1e5c9)
2017-11-22 18:07:20 +08:00
badlogic
ed2594deca [csharp] Fix not returning to setup pose when multiple mixing from entries end at same time. See #1027 2017-10-28 09:44:21 +02:00
John
1f704aec5e [csharp] Don't use the dip fix if mixing is complete.
Based on: 28fd5aff09
See https://github.com/EsotericSoftware/spine-runtimes/issues/1024
2017-10-24 00:41:35 +08:00
pharan
61d9f729d6 [csharp] New labeled goto convention. For https://github.com/EsotericSoftware/spine-runtimes/issues/1002 2017-09-26 21:39:05 +08:00
John
f796d15f31 [csharp] Match libGDX setTimelineData 2017-08-23 18:44:17 +08:00
John
50730c7a5c [csharp] Fixed interrupting a mix with mixDuration 0.
Port of c8d595565b
closes https://github.com/EsotericSoftware/spine-runtimes/issues/970
2017-08-23 18:28:44 +08:00
pharan
03f8313435 [csharp] Cleanup of AnimationState and ExposedList 2017-07-27 17:14:56 +08:00
John
4139546b87 [csharp] Don't use DIP_MIX across tracks.
based on 61e54a5771
2017-06-24 12:44:38 +08:00
John
733f634e19 [csharp] TrackEntry.AnimationEnd setter. :p 2017-06-16 07:28:25 +08:00
pharan
44a44aa6c6 [csharp] Changed Timeline.Apply. Animation, AnimationState handle setup pose before first key. 2017-06-13 08:49:29 +08:00
John
8fa441e284 [csharp] Return true from AnimationState#apply if any animation was applied. 2017-06-02 21:59:00 +08:00
John
c107594106 [csharp] Remove mixing from limit, dispose track entries ASAP. a69f9d579f 2017-05-24 14:59:34 +08:00
John
aa3969f147 [csharp] Remove mixing from limit, dispose track entries ASAP. a69f9d579f
https://github.com/EsotericSoftware/spine-runtimes/issues/899
2017-05-24 14:57:55 +08:00
John
53d80a4020 [csharp] Fix missing port. be583ba96d 2017-05-23 13:59:23 +08:00
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