UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-04 22:34:53 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,541 Commits 17 Branches 33 Tags
Commit Graph

1541 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
NathanSweet
c7bb3f3af8 Ensure the track entry has the correct time when start and end are fired. 
#154
 2016-01-12 17:18:45 +01:00
NathanSweet
b6f7e50ff7 Fixed events on first frame not being fired for looping animations when their duration is 1s. 2016-01-12 17:17:49 +01:00
NathanSweet
2650e2679d Apply remaining time to next animation. 
Previously one frame worth of delta time was lost.

When the end of an animation is passed, one frame goes by so the animation has a chance to apply its final pose and fire any events on its last few frames. The second animation starts using the amount of time since the actual end of the first animation.

#154
 2016-01-12 06:46:11 +01:00
NathanSweet
ec3db90e65 Fixed skeleton flip. 2016-01-12 06:42:41 +01:00
John
06687a3595 Removed GetSkeleton. Still has .Skeleton property. 2016-01-11 20:42:51 +08:00
NathanSweet
f8ad5514af AnimationState unit test. 
Pharan, y u so silly?!
 2016-01-11 09:16:55 +01:00
NathanSweet
426744afc1 Don't require animation selection. 2016-01-11 09:16:07 +01:00
NathanSweet
b9acf228f8 Clean up. 2016-01-11 02:18:37 +01:00
NathanSweet
f748b5b9bc Fixed inherit scale/rotation not being initialized. 2016-01-11 02:18:31 +01:00
NathanSweet
50282a0209 Merge remote-tracking branch 'origin/master' 2016-01-11 00:32:41 +01:00
NathanSweet
37f2f9e880 Updated for Spine 3.0.00. 2016-01-11 00:32:36 +01:00
John
392a95590e Merge pull request #504 from EsotericSoftware/unity-uwp-fix 
Unity UWP Fix
 2016-01-10 17:58:32 +08:00
pharan
3d6376f0e9 Merge branch 'master' into unity-uwp-fix 2016-01-09 01:01:31 +08:00
John
18850d9830 Merge pull request #486 from tsteinholz/master 
[SFML] Fixed include statments
 2016-01-08 11:55:47 +08:00
pharan
8c7038c0b9 [Unity] Autoreset will be a separate script until we clear up mixing stuff. Sorry for the confusion! 2016-01-05 15:41:10 +08:00
pharan
f0d1b75732 [Unity] Disabled a false error message. 2016-01-04 09:39:38 +08:00
pharan
ff5b7e67e4 [Unity] Updated Readme. 2016-01-04 09:10:18 +08:00
pharan
64f69343a2 [Unity] Allow SkeletonGhost use in camera distance sorting setup. 2016-01-02 18:55:45 +08:00
pharan
bfb58cbb19 [Unity] Some ExposedList use optimization within loops. 2016-01-02 17:50:49 +08:00
John
83a7ecc3b0 [TK2D] Fixed null array reference in some cases. 
from this PR: https://github.com/EsotericSoftware/spine-runtimes/pull/400
The other half of this PR was already applied in a previous commit.

Thanks @YiDuwon
 2016-01-02 06:36:02 +08:00
pharan
c92e0f95d8 Merge branch 'master' of https://github.com/EsotericSoftware/spine-runtimes 2016-01-02 06:08:06 +08:00
pharan
b7f2f526ac [Unity] Fixed SkeletonDataAsset Inspector when drawing empty BoundingBoxAttachment 2016-01-02 06:06:31 +08:00
John
119e19c212 [Monogame] Fixed compatibility with spine-csharp 2015-12-31 15:34:11 +08:00
pharan
3d19e22064 [XNA] Fixed compatibility with spine-csharp 2015-12-31 11:58:04 +08:00
pharan
e116c15ffb [Unity] Minor update to sample scene scripts. 2015-12-31 09:45:14 +08:00
pharan
fb9f53ee23 [Unity] Shortened new [SpineEvent] property drawer attribute. 2015-12-31 09:36:54 +08:00
pharan
4a7d3ecf96 [Unity] Extra constructors for WaitForSpineEvent 2015-12-31 09:34:56 +08:00
pharan
914419d5fa [Unity] New Spine yield returns for coroutines. 2015-12-30 17:16:28 +08:00
pharan
92fb16b7c2 Merge remote-tracking branch 'esotericsoftware/master' 2015-12-30 17:04:44 +08:00
John
3843b7f9d3 Merge pull request #500 from EsotericSoftware/unity-attributes 
[Unity] Property Attribute updates

New [SpineEventData] attribute.
Some refactoring.
 2015-12-30 15:41:21 +08:00
John
6d386c544d [Unity] SpineAttributeDrawer Update 2015-12-30 15:36:49 +08:00
John
7d002f99e5 [Unity] SpineAttributeBase & EventDataAttribute 2015-12-30 15:31:00 +08:00
John
da10b70b84 Merge pull request #499 from EsotericSoftware/unity-autoreset 
[Unity] SkeletonAnimation Update

Built-in, Opt-in, generic Autoreset handling (under the Advanced foldout).
Inspector tooltips.
XML docs for public members.
 2015-12-30 15:13:56 +08:00
John
96232f891c Merge pull request #498 from EsotericSoftware/flickerfix 
[Unity] Fix flickering in certain cases.

http://esotericsoftware.com/forum/Flickering-and-a-solution-for-it-5299
http://esotericsoftware.com/forum/Weird-flicker-between-some-of-the-animations-5577

https://github.com/EsotericSoftware/spine-runtimes/issues/494

Also included:
Moved attachment and flip array checks outside of extra loops in CheckIfMustUpdateMeshStructure to prevent O(2n) behavior.
Renamed some identifiers. "temp" is replaced with "working". The analogy is human brain's "working memory".
Added some cached references within the method's stack (where their members are frequently accessed).
Added comments for easy update, in preparation for incoming changes in Spine v3.
 2015-12-30 15:06:46 +08:00
John
727c242e6f [Unity] Fix for Unity UWP/Windows Phone 
https://github.com/EsotericSoftware/spine-runtimes/issues/495
 2015-12-30 14:59:23 +08:00
John
81eb9c49b4 [Unity] Fix for Unity UWP/Windows Phone 2015-12-30 14:58:09 +08:00
John
8006c7b4b9 [Unity] Fix for Unity UWP/Windows Phone 
https://github.com/EsotericSoftware/spine-runtimes/issues/495
 2015-12-30 14:55:05 +08:00
John
dd28645a0b [Unity] Fix for Unity UWP/Windows Phone 
https://github.com/EsotericSoftware/spine-runtimes/issues/495

http://de.esotericsoftware.com/forum/Can-t-build-a-Windows-Store-App-with-Unity-Errors-4354
 2015-12-30 14:44:33 +08:00
John
bb7d131c28 [Unity] AnimationName warnings 
https://github.com/EsotericSoftware/spine-runtimes/issues/444

This makes AnimationName getter and setter safer but still warns the user of unusual circumstances.
 2015-12-29 04:46:36 +08:00
John
e37a9dd16b [C#] Have world transforms ready on instatiation 
This also allows [Spine-Unity] SkeletonRenderer to work by itself: https://github.com/EsotericSoftware/spine-runtimes/issues/453
 2015-12-29 04:33:03 +08:00
John
66908cb2af Merge pull request #496 from EsotericSoftware/unity-atlas-ingest-fix 
[Unity] Atlas ingestion safety
 2015-12-29 04:12:43 +08:00
John
0ea9bd216f [Unity] Atlas ingestion safety 
https://github.com/EsotericSoftware/spine-runtimes/pull/259
 2015-12-29 04:12:05 +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
John
fd125f99f7 Merge pull request #455 from pharan/patch-3 
Add ExposedList.cs to C# csproj.
 2015-12-25 22:44:19 +08:00
John
1330842e1a Merge pull request #456 from pharan/patch-4 
Add ExposedList.cs to C#-XNA csproj.
 2015-12-25 22:44:07 +08:00
John
f70bd2e310 Merge pull request #433 from kickbomb/master 
Fix for unexpected huge skeleton render scale when using SPINE_TK2D
 2015-12-25 22:13:31 +08:00
John
5378b7979e Auto-reset checkbox in SkeletonAnimation inspector 2015-12-24 06:56:04 +08:00
John
f67a5457a0 Opt-in Generic Autoreset for SkeletonAnimation 
This allows users to easily let the SkeletonAnimation act like Spine editor (not inheriting poses from previous animations) without adding extra code.
 2015-12-24 06:53:59 +08:00
John
205e0dc5ad [Unity] Fix material array incorrect persistence 
This fixes a separate flickering bug.
Reported in the forum here: http://esotericsoftware.com/forum/Weird-flicker-between-some-of-the-animations-5577
The solution was to compare `this.sharedMaterials` against the immediately-determined material array.

Also included:
Moved attachment and flip array checks outside of extra loops in CheckIfMustUpdateMeshStructure to prevent O(2n) behavior.
Renamed some identifiers. "temp" is replaced with "working". The analogy is human brain's "working memory".
Added some cached references within the method's stack (where their members are frequently accessed).
Added comments for easy update, in preparation for incoming changes in Spine v3.
 2015-12-23 03:31:56 +08:00