84 Commits

Author SHA1 Message Date
Liquidoodle
b51a110c54 Fixed file loading for XNA on Windows Phone 7. 2013-10-10 18:02:50 +01:00
NathanSweet
f3be613429 Fixed clearing tracks in event callbacks. 2013-10-10 18:49:16 +02:00
NathanSweet
7bd9eeeee6 Use 3 arg Enum.Parse. 2013-10-10 16:02:50 +02:00
NathanSweet
97f9b7e4d2 Fixed clearing tracks in event callbacks.
closes #134
2013-10-10 10:15:53 +02:00
Nathan Sweet
90c49a86f4 Merge pull request #133 from pharan/patch-3
changed findEvent to FindEvent (to match change in SkeletonData.cs)
2013-10-09 04:37:42 -07:00
John
2572a4ede9 changed findEvent to FindEvent (to match change in SkeletonData.cs) 2013-10-09 14:34:44 +08:00
John
402b3c862f changed findEvent to FindEvent (C# method naming) 2013-10-09 14:32:56 +08: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
NathanSweet
45c3487098 Events list is now required.
Simplifies applying the event timeline and isn't hard to supply.
2013-10-02 14:10:55 +02:00
NathanSweet
47ce2a40c1 Minor update to the license to include education. 2013-10-01 14:55:15 +02:00
NathanSweet
2dc486b2d5 Fixed first event not getting fired.
Damn this is hard to get exactly right!
2013-09-29 23:42:55 +02:00
NathanSweet
af5aca8b66 Changed when events are fired.
Events are now fired from lastTime (exclusive) to time (inclusive). This allows an event at the end of an animation to be fired before the next animation starts. The "complete" callback will happen before the event though, because "complete" happens in update() and events are triggered in apply().

Note events are not fired for the previous animation during mixing (crossfading).
2013-09-29 23:22:55 +02:00
NathanSweet
308e18b376 Fixed event timeline missing first event. 2013-09-29 22:51:08 +02:00
NathanSweet
5390d40093 Fixed spine-unity, spine-tk2d. 2013-09-29 22:15:25 +02:00
NathanSweet
b132231034 Scale bounding boxes on load. 2013-09-28 23:33:41 +02:00
NathanSweet
0c5e3b4400 Alternate Atlas constructor. 2013-09-28 21:39:45 +02:00
NathanSweet
3797b7b7b0 Clear a track if the last entry is non-looping and reached endTime. 2013-09-28 21:28:01 +02:00
NathanSweet
b854dd94c3 Fixed bugs with timeScale. 2013-09-28 20:22:56 +02:00
NathanSweet
fc92128519 Time scale, per AnimationState and per track. 2013-09-28 01:43:06 +02:00
NathanSweet
364f1ff174 Default inherit to true. 2013-09-27 23:56:08 +02:00
NathanSweet
832b0f02aa C# style method and class docs.
closes 127
2013-09-27 14:48:54 +02:00
NathanSweet
58545382fc Fixed reading ints. 2013-09-27 14:03:07 +02:00
NathanSweet
359b25d9d4 spine-tk2d and spine-unity updated to latest spine-csharp.
closes #120
closes #125
2013-09-26 10:02:17 +02:00
NathanSweet
98bf05c305 Minor cleanup. 2013-09-26 09:36:23 +02:00
NathanSweet
2df28f8564 More AnimationState refactoring, getting good!
#113
2013-09-25 19:39:48 +02:00
NathanSweet
0049b4f7b4 Refactored AnimationState to better support setting a to/from time.
#113
2013-09-25 12:13:57 +02:00
NathanSweet
1e30ad1b72 Reset draw order in setSlotsToSetupPose. 2013-09-25 10:17:35 +02:00
NathanSweet
8cec4eb354 Simplified SkeletonBounds AABB computation. 2013-09-24 15:37:46 +02:00
NathanSweet
dda304faa0 Renamed ComputeVertices to ComputeWorldVertices.
Sorry for the API breakage, but this is line with UpdateWorldTransform, BoundingBoxAttachment, and future attachments.
2013-09-24 15:37:29 +02:00
NathanSweet
2b86668f4e More efficient draw order when bind pose order is keyed. 2013-09-24 11:10:10 +02:00
NathanSweet
90877fe14c Added missing files.
closes #117
2013-09-24 08:06:41 +02:00
NathanSweet
60ac4d7533 Don't use properties internally.
Mono is slower using properties.
2013-09-23 20:25:15 +02:00
NathanSweet
d2d6919afb Event timeline for spine-csharp. 2013-09-22 22:33:38 +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
1db0e71257 Minor updates. 2013-09-20 18:56:21 +02:00
NathanSweet
e1fe518261 Bounding boxes for spine-csharp. 2013-09-20 16:42:55 +02:00
NathanSweet
734505c91c Additive blending for spine-csharp and spine-xna. 2013-09-20 14:03:52 +02:00
NathanSweet
a511e267d2 Keyable draw order for spine-csharp. 2013-09-20 13:49:31 +02:00
NathanSweet
9ac25382ae Fixed XNA projects. 2013-09-20 13:22:14 +02:00
Nathan Sweet
d26317ab99 Merge pull request #108 from CloneDeath/master
Made a 2nd "_xna" .csproj file for the C# runtimes. This is unavoidable,...
2013-08-22 11:44:12 -07:00
Nicholas Rodine
4cc0a2b5ab Made a 2nd "_xna" .csproj file for the C# runtimes. This is unavoidable, as microsoft is ass-backwards. The proper solution would be to add an "XNA" configuration (or even better, "XNA-XBOX" and "XNA-Windows" configuration), but Microsoft requires that any project referenced by XNA also import XNA, even if the base project doesn't depend on it.
Removed a lot of unneccessary stuff from the normal spine-csharp.csproj file, as no one else has Ultimate Edition and they were not configured properly.
Changed the XNA solution to point to the _xna csproj.
2013-08-22 10:38:55 -04:00
Nathan Sweet
fd73ec64fa Merge pull request #105 from CloneDeath/master
Upgraded to VS2010. Removed XNA dependency. Targeted AnyCPU.
2013-08-16 08:13:56 -07:00
NathanSweet
cc6b4a3e7f Merged #103. 2013-08-16 13:40:03 +02:00
NathanSweet
92c3fbe946 Throw right exception. 2013-08-16 12:23:04 +02:00
Nicholas Rodine
45e300bbfc Upgraded to VS2010. Removed XNA dependency. 2013-08-11 15:57:07 -04:00
NathanSweet
75d393d928 Braces on same line! 2013-08-10 12:28:23 +02:00
NathanSweet
d0ebe5515e Fixed atlas attachment loader. 2013-08-04 17:41:25 +02:00
NathanSweet
0784725106 Merge branch 'origin/master' 2013-08-02 15:09:06 +02:00