1521 Commits

Author SHA1 Message Date
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
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
John
6778a039c6 Flickering fix
Force it to update both meshes when new triangles need to be pushed.
http://esotericsoftware.com/forum/Flickering-and-a-solution-for-it-5299
2015-12-19 20:02:10 +08:00
John
55136345ae Merge pull request #8 from EsotericSoftware/master
Merging with official runtime.
2015-12-19 15:24:36 +08:00
John
78b303877b Merge pull request #493 from EsotericSoftware/pharan-patch-1
[Unity] Fix GroundConstraint -y pose values
2015-12-15 17:19:39 +08:00
John
e4f9c46412 [Unity] Fix GroundConstraint -y pose values
Fix for this issue: https://github.com/EsotericSoftware/spine-runtimes/issues/484
http://esotericsoftware.com/forum/Unity-IK-SkeletonUtilityGroundConstraint-problem-5464
2015-12-15 17:19:18 +08:00
John
ed35664230 Merge pull request #437 from witcher112/master
Unity 5 and Windows Phone building fixes
2015-12-15 17:15:48 +08:00
John
c28d6442ff Merge pull request #482 from LostPolygon/animator-fix
[Spine-Unity] Fix occasional broken frame at the moment node transition happened
2015-12-15 16:15:28 +08:00
John
0474200575 Merge pull request #473 from LostPolygon/reimport-improvements
[Spine-Unity] Improved handling of Reimport All and some other weird asset import cases
2015-12-15 16:13:56 +08:00
John
a43c849dfe Merge pull request #483 from LostPolygon/optimization-fix
[Spine-Unity] Fix #481
2015-12-15 16:13:37 +08:00
John
af65daa57b Merge pull request #7 from EsotericSoftware/master
Merging with official runtime.
2015-12-04 02:25:55 +08:00
Serhii Yolkin
3218c78239 compare references to attachments instead of comparing attachment properties 2015-11-21 18:08:17 +01:00
Serhii Yolkin
8ebf27de24 some refactoring 2015-11-21 17:56:14 +01:00
Serhii Yolkin
990eb6a8f0 fix occasional broken frame at the moment node transition happened 2015-11-21 17:47:37 +01:00
NathanSweet
f6e4027ef1 Reverting corrupt files. 2015-11-04 09:15:04 +01:00
NathanSweet
1a628a66f7 Fixed multithreaded atlas loading.
Sometimes I wonder what I was thinking.
2015-11-04 07:33:02 +01:00
NathanSweet
3b5109032c Fixed goblin example. 2015-11-03 03:03:39 +01:00
NathanSweet
d8d5405ba3 Fixed JSON parsing for all locales.
http://esotericsoftware.com/forum/Spine-c-runtime-strtod-Problem-5380
2015-11-03 03:03:27 +01:00
Serhii Yolkin
3cbf42d743 derp 2015-10-13 00:00:38 +02:00
Serhii Yolkin
7d60e4e255 improved handling of Reimport All and some other weird asset import cases 2015-10-11 20:26:42 +02:00