UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.6' into 3.7-beta

Browse Source
This commit is contained in:
badlogic 2018-02-13 14:20:04 +01:00
commit 3f32e071a1
332 changed files with 832 additions and 427 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-ue4/SpineUE4.uproject
View File

@ -1,6 +1,6 @@
{ {
"FileVersion": 3, "FileVersion": 3,
"EngineAssociation": "4.17", "EngineAssociation": "4.18",
"Category": "", "Category": "",
"Description": "", "Description": "",
"Modules": [ "Modules": [

5
spine-unity/Assets/Gizmos.meta
View File

@ -1,5 +0,0 @@
fileFormatVersion: 2
guid: a260a1ff5965c2c4f88aea3e7d433965
folderAsset: yes
DefaultImporter:
userData:

0
spine-unity/Assets/Examples.meta → spine-unity/Assets/Spine Examples.meta
View File

0
spine-unity/Assets/Examples/Getting Started.meta → spine-unity/Assets/Spine Examples/Getting Started.meta
View File

0
spine-unity/Assets/Examples/Getting Started/1 The Spine GameObject.unity → spine-unity/Assets/Spine Examples/Getting Started/1 The Spine GameObject.unity
View File

0
spine-unity/Assets/Examples/Getting Started/1 The Spine GameObject.unity.meta → spine-unity/Assets/Spine Examples/Getting Started/1 The Spine GameObject.unity.meta
View File

0
spine-unity/Assets/Examples/Getting Started/2 Controlling Animation.unity → spine-unity/Assets/Spine Examples/Getting Started/2 Controlling Animation.unity
View File

0
spine-unity/Assets/Examples/Getting Started/2 Controlling Animation.unity.meta → spine-unity/Assets/Spine Examples/Getting Started/2 Controlling Animation.unity.meta
View File

4
spine-unity/Assets/Examples/Getting Started/3 Controlling Animation Continued.unity → spine-unity/Assets/Spine Examples/Getting Started/3 Controlling Animation Continued.unity
View File

@ -267,7 +267,7 @@ MonoBehaviour:
zSpacing: 0 zSpacing: 0
useClipping: 1 useClipping: 1
immutableTriangles: 0 immutableTriangles: 0
pmaVertexColors: 1 pmaVertexColors: 0
clearStateOnDisable: 0 clearStateOnDisable: 0
tintBlack: 0 tintBlack: 0
singleSubmesh: 0 singleSubmesh: 0
@ -348,7 +348,7 @@ MonoBehaviour:
audioClip: {fileID: 8300000, guid: e885484e1bc99fb47a0ac3f6bfa586b1, type: 3} audioClip: {fileID: 8300000, guid: e885484e1bc99fb47a0ac3f6bfa586b1, type: 3}
basePitch: 0.5 basePitch: 0.5
randomPitchOffset: 0.25 randomPitchOffset: 0.25
debugMessage: 0 logDebugMessage: 0
--- !u!114 &1256911799 --- !u!114 &1256911799
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

0
spine-unity/Assets/Examples/Getting Started/3 Controlling Animation Continued.unity.meta → spine-unity/Assets/Spine Examples/Getting Started/3 Controlling Animation Continued.unity.meta
View File

0
spine-unity/Assets/Examples/Getting Started/4 Object Oriented Sample.unity → spine-unity/Assets/Spine Examples/Getting Started/4 Object Oriented Sample.unity
View File

0
spine-unity/Assets/Examples/Getting Started/4 Object Oriented Sample.unity.meta → spine-unity/Assets/Spine Examples/Getting Started/4 Object Oriented Sample.unity.meta
View File

0
spine-unity/Assets/Examples/Getting Started/5 Basic Platformer.unity → spine-unity/Assets/Spine Examples/Getting Started/5 Basic Platformer.unity
View File

0
spine-unity/Assets/Examples/Getting Started/5 Basic Platformer.unity.meta → spine-unity/Assets/Spine Examples/Getting Started/5 Basic Platformer.unity.meta
View File

0
spine-unity/Assets/Examples/Getting Started/6 SkeletonGraphic.unity → spine-unity/Assets/Spine Examples/Getting Started/6 SkeletonGraphic.unity
View File

0
spine-unity/Assets/Examples/Getting Started/6 SkeletonGraphic.unity.meta → spine-unity/Assets/Spine Examples/Getting Started/6 SkeletonGraphic.unity.meta
View File

0
spine-unity/Assets/Examples/Other Examples.meta → spine-unity/Assets/Spine Examples/Other Examples.meta
View File

0
spine-unity/Assets/Examples/Other Examples/AtlasRegionAttacher.unity → spine-unity/Assets/Spine Examples/Other Examples/AtlasRegionAttacher.unity
View File

0
spine-unity/Assets/Examples/Other Examples/AtlasRegionAttacher.unity.meta → spine-unity/Assets/Spine Examples/Other Examples/AtlasRegionAttacher.unity.meta
View File

0
spine-unity/Assets/Examples/Other Examples/Dragon.unity → spine-unity/Assets/Spine Examples/Other Examples/Dragon.unity
View File

0
spine-unity/Assets/Examples/Other Examples/Dragon.unity.meta → spine-unity/Assets/Spine Examples/Other Examples/Dragon.unity.meta
View File

0
spine-unity/Assets/Examples/Other Examples/Goblins.unity → spine-unity/Assets/Spine Examples/Other Examples/Goblins.unity
View File

0
spine-unity/Assets/Examples/Other Examples/Goblins.unity.meta → spine-unity/Assets/Spine Examples/Other Examples/Goblins.unity.meta
View File

0
spine-unity/Assets/Examples/Other Examples/Instantiate from Script.unity → spine-unity/Assets/Spine Examples/Other Examples/Instantiate from Script.unity
View File

0
spine-unity/Assets/Examples/Other Examples/Instantiate from Script.unity.meta → spine-unity/Assets/Spine Examples/Other Examples/Instantiate from Script.unity.meta
View File

0
spine-unity/Assets/Examples/Other Examples/Mix and Match.unity → spine-unity/Assets/Spine Examples/Other Examples/Mix and Match.unity
View File

0
spine-unity/Assets/Examples/Other Examples/Mix and Match.unity.meta → spine-unity/Assets/Spine Examples/Other Examples/Mix and Match.unity.meta
View File

0
spine-unity/Assets/Examples/Other Examples/Per Instance Material Properties.unity → spine-unity/Assets/Spine Examples/Other Examples/Per Instance Material Properties.unity
View File

0
spine-unity/Assets/Examples/Other Examples/Per Instance Material Properties.unity.meta → spine-unity/Assets/Spine Examples/Other Examples/Per Instance Material Properties.unity.meta
View File

0
spine-unity/Assets/Examples/Other Examples/SkeletonAnimationMulti.unity → spine-unity/Assets/Spine Examples/Other Examples/SkeletonAnimationMulti.unity
View File

0
spine-unity/Assets/Examples/Other Examples/SkeletonAnimationMulti.unity.meta → spine-unity/Assets/Spine Examples/Other Examples/SkeletonAnimationMulti.unity.meta
View File

0
spine-unity/Assets/Examples/Other Examples/SkeletonRenderSeparator.unity → spine-unity/Assets/Spine Examples/Other Examples/SkeletonRenderSeparator.unity
View File

0
spine-unity/Assets/Examples/Other Examples/SkeletonRenderSeparator.unity.meta → spine-unity/Assets/Spine Examples/Other Examples/SkeletonRenderSeparator.unity.meta
View File

0
spine-unity/Assets/Examples/Other Examples/SkeletonUtility Animated Physics.unity → spine-unity/Assets/Spine Examples/Other Examples/SkeletonUtility Animated Physics.unity
View File

0
spine-unity/Assets/Examples/Other Examples/SkeletonUtility Animated Physics.unity.meta → spine-unity/Assets/Spine Examples/Other Examples/SkeletonUtility Animated Physics.unity.meta
View File

0
spine-unity/Assets/Examples/Other Examples/SkeletonUtility Eyes.unity → spine-unity/Assets/Spine Examples/Other Examples/SkeletonUtility Eyes.unity
View File

0
spine-unity/Assets/Examples/Other Examples/SkeletonUtility Eyes.unity.meta → spine-unity/Assets/Spine Examples/Other Examples/SkeletonUtility Eyes.unity.meta
View File

0
spine-unity/Assets/Examples/Other Examples/SkeletonUtility GroundConstraint.unity → spine-unity/Assets/Spine Examples/Other Examples/SkeletonUtility GroundConstraint.unity
View File

0
spine-unity/Assets/Examples/Other Examples/SkeletonUtility GroundConstraint.unity.meta → spine-unity/Assets/Spine Examples/Other Examples/SkeletonUtility GroundConstraint.unity.meta
View File

0
spine-unity/Assets/Examples/Other Examples/SkeletonUtility Ragdoll.unity → spine-unity/Assets/Spine Examples/Other Examples/SkeletonUtility Ragdoll.unity
View File

0
spine-unity/Assets/Examples/Other Examples/SkeletonUtility Ragdoll.unity.meta → spine-unity/Assets/Spine Examples/Other Examples/SkeletonUtility Ragdoll.unity.meta
View File

0
spine-unity/Assets/Examples/Other Examples/SpineGauge.unity → spine-unity/Assets/Spine Examples/Other Examples/SpineGauge.unity
View File

0
spine-unity/Assets/Examples/Other Examples/SpineGauge.unity.meta → spine-unity/Assets/Spine Examples/Other Examples/SpineGauge.unity.meta
View File

0
spine-unity/Assets/Examples/Other Examples/Sprite Shaders.unity → spine-unity/Assets/Spine Examples/Other Examples/Sprite Shaders.unity
View File

0
spine-unity/Assets/Examples/Other Examples/Sprite Shaders.unity.meta → spine-unity/Assets/Spine Examples/Other Examples/Sprite Shaders.unity.meta
View File

0
spine-unity/Assets/Examples/Other Examples/VertexEffect.unity → spine-unity/Assets/Spine Examples/Other Examples/VertexEffect.unity
View File

0
spine-unity/Assets/Examples/Other Examples/VertexEffect.unity.meta → spine-unity/Assets/Spine Examples/Other Examples/VertexEffect.unity.meta
View File

0
spine-unity/Assets/Examples/Scripts.meta → spine-unity/Assets/Spine Examples/Scripts.meta
View File

0
spine-unity/Assets/Examples/Scripts/AttackSpineboy.cs → spine-unity/Assets/Spine Examples/Scripts/AttackSpineboy.cs
View File

0
spine-unity/Assets/Examples/Scripts/AttackSpineboy.cs.meta → spine-unity/Assets/Spine Examples/Scripts/AttackSpineboy.cs.meta
View File

0
spine-unity/Assets/Examples/Scripts/DataAssetsFromExportsExample.cs → spine-unity/Assets/Spine Examples/Scripts/DataAssetsFromExportsExample.cs
View File

0
spine-unity/Assets/Examples/Scripts/DataAssetsFromExportsExample.cs.meta → spine-unity/Assets/Spine Examples/Scripts/DataAssetsFromExportsExample.cs.meta
View File

0
spine-unity/Assets/Examples/Scripts/FootSoldierExample.cs → spine-unity/Assets/Spine Examples/Scripts/FootSoldierExample.cs
View File

0
spine-unity/Assets/Examples/Scripts/FootSoldierExample.cs.meta → spine-unity/Assets/Spine Examples/Scripts/FootSoldierExample.cs.meta
View File

0
spine-unity/Assets/Examples/Scripts/Getting Started Scripts.meta → spine-unity/Assets/Spine Examples/Scripts/Getting Started Scripts.meta
View File

0
spine-unity/Assets/Examples/Scripts/Getting Started Scripts/BasicPlatformerController.cs → spine-unity/Assets/Spine Examples/Scripts/Getting Started Scripts/BasicPlatformerController.cs
View File

0
spine-unity/Assets/Examples/Scripts/Getting Started Scripts/BasicPlatformerController.cs.meta → spine-unity/Assets/Spine Examples/Scripts/Getting Started Scripts/BasicPlatformerController.cs.meta
View File

0
spine-unity/Assets/Examples/Scripts/Getting Started Scripts/ConstrainedCamera.cs → spine-unity/Assets/Spine Examples/Scripts/Getting Started Scripts/ConstrainedCamera.cs
View File

0
spine-unity/Assets/Examples/Scripts/Getting Started Scripts/ConstrainedCamera.cs.meta → spine-unity/Assets/Spine Examples/Scripts/Getting Started Scripts/ConstrainedCamera.cs.meta
View File

0
spine-unity/Assets/Examples/Scripts/Getting Started Scripts/Raptor.cs → spine-unity/Assets/Spine Examples/Scripts/Getting Started Scripts/Raptor.cs
View File

0
spine-unity/Assets/Examples/Scripts/Getting Started Scripts/Raptor.cs.meta → spine-unity/Assets/Spine Examples/Scripts/Getting Started Scripts/Raptor.cs.meta
View File

0
spine-unity/Assets/Examples/Scripts/Getting Started Scripts/SpineBeginnerTwo.cs → spine-unity/Assets/Spine Examples/Scripts/Getting Started Scripts/SpineBeginnerTwo.cs
View File

0
spine-unity/Assets/Examples/Scripts/Getting Started Scripts/SpineBeginnerTwo.cs.meta → spine-unity/Assets/Spine Examples/Scripts/Getting Started Scripts/SpineBeginnerTwo.cs.meta
View File

0
spine-unity/Assets/Examples/Scripts/Getting Started Scripts/SpineBlinkPlayer.cs → spine-unity/Assets/Spine Examples/Scripts/Getting Started Scripts/SpineBlinkPlayer.cs
View File

0
spine-unity/Assets/Examples/Scripts/Getting Started Scripts/SpineBlinkPlayer.cs.meta → spine-unity/Assets/Spine Examples/Scripts/Getting Started Scripts/SpineBlinkPlayer.cs.meta
View File

0
spine-unity/Assets/Examples/Scripts/Getting Started Scripts/SpineboyBeginnerInput.cs → spine-unity/Assets/Spine Examples/Scripts/Getting Started Scripts/SpineboyBeginnerInput.cs
View File

0
spine-unity/Assets/Examples/Scripts/Getting Started Scripts/SpineboyBeginnerInput.cs.meta → spine-unity/Assets/Spine Examples/Scripts/Getting Started Scripts/SpineboyBeginnerInput.cs.meta
View File

0
spine-unity/Assets/Examples/Scripts/Getting Started Scripts/SpineboyBeginnerModel.cs → spine-unity/Assets/Spine Examples/Scripts/Getting Started Scripts/SpineboyBeginnerModel.cs
View File

0
spine-unity/Assets/Examples/Scripts/Getting Started Scripts/SpineboyBeginnerModel.cs.meta → spine-unity/Assets/Spine Examples/Scripts/Getting Started Scripts/SpineboyBeginnerModel.cs.meta
View File

0
spine-unity/Assets/Examples/Scripts/Getting Started Scripts/SpineboyBeginnerView.cs → spine-unity/Assets/Spine Examples/Scripts/Getting Started Scripts/SpineboyBeginnerView.cs
View File

0
spine-unity/Assets/Examples/Scripts/Getting Started Scripts/SpineboyBeginnerView.cs.meta → spine-unity/Assets/Spine Examples/Scripts/Getting Started Scripts/SpineboyBeginnerView.cs.meta
View File

0
spine-unity/Assets/Examples/Scripts/Getting Started Scripts/SpineboyTargetController.cs → spine-unity/Assets/Spine Examples/Scripts/Getting Started Scripts/SpineboyTargetController.cs
View File

0
spine-unity/Assets/Examples/Scripts/Getting Started Scripts/SpineboyTargetController.cs.meta → spine-unity/Assets/Spine Examples/Scripts/Getting Started Scripts/SpineboyTargetController.cs.meta
View File

0
spine-unity/Assets/Examples/Scripts/Goblins.cs → spine-unity/Assets/Spine Examples/Scripts/Goblins.cs
View File

0
spine-unity/Assets/Examples/Scripts/Goblins.cs.meta → spine-unity/Assets/Spine Examples/Scripts/Goblins.cs.meta
View File

0
spine-unity/Assets/Examples/Scripts/HandleEventWithAudioExample.cs → spine-unity/Assets/Spine Examples/Scripts/HandleEventWithAudioExample.cs
View File

0
spine-unity/Assets/Examples/Scripts/HandleEventWithAudioExample.cs.meta → spine-unity/Assets/Spine Examples/Scripts/HandleEventWithAudioExample.cs.meta
View File

0
spine-unity/Assets/Examples/Scripts/HurtFlashEffect.cs → spine-unity/Assets/Spine Examples/Scripts/HurtFlashEffect.cs
View File

0
spine-unity/Assets/Examples/Scripts/HurtFlashEffect.cs.meta → spine-unity/Assets/Spine Examples/Scripts/HurtFlashEffect.cs.meta
View File

0
spine-unity/Assets/Examples/Scripts/MaterialPropertyBlockExample.cs → spine-unity/Assets/Spine Examples/Scripts/MaterialPropertyBlockExample.cs
View File

0
spine-unity/Assets/Examples/Scripts/MaterialPropertyBlockExample.cs.meta → spine-unity/Assets/Spine Examples/Scripts/MaterialPropertyBlockExample.cs.meta
View File

0
spine-unity/Assets/Examples/Scripts/MixAndMatch.cs → spine-unity/Assets/Spine Examples/Scripts/MixAndMatch.cs
View File

0
spine-unity/Assets/Examples/Scripts/MixAndMatch.cs.meta → spine-unity/Assets/Spine Examples/Scripts/MixAndMatch.cs.meta
View File

0
spine-unity/Assets/Examples/Scripts/MixAndMatchGraphic.cs → spine-unity/Assets/Spine Examples/Scripts/MixAndMatchGraphic.cs
View File

0
spine-unity/Assets/Examples/Scripts/MixAndMatchGraphic.cs.meta → spine-unity/Assets/Spine Examples/Scripts/MixAndMatchGraphic.cs.meta
View File

0
spine-unity/Assets/Examples/Scripts/RaggedySpineboy.cs → spine-unity/Assets/Spine Examples/Scripts/RaggedySpineboy.cs
View File

0
spine-unity/Assets/Examples/Scripts/RaggedySpineboy.cs.meta → spine-unity/Assets/Spine Examples/Scripts/RaggedySpineboy.cs.meta
View File

0
spine-unity/Assets/Examples/Scripts/Rotator.cs → spine-unity/Assets/Spine Examples/Scripts/Rotator.cs
View File

0
spine-unity/Assets/Examples/Scripts/Rotator.cs.meta → spine-unity/Assets/Spine Examples/Scripts/Rotator.cs.meta
View File

0
spine-unity/Assets/Examples/Scripts/Sample Components.meta → spine-unity/Assets/Spine Examples/Scripts/Sample Components.meta
View File

0
spine-unity/Assets/Examples/Scripts/Sample Components/BoneLocalOverride.cs → spine-unity/Assets/Spine Examples/Scripts/Sample Components/BoneLocalOverride.cs
View File

0
spine-unity/Assets/Examples/Scripts/Sample Components/BoneLocalOverride.cs.meta → spine-unity/Assets/Spine Examples/Scripts/Sample Components/BoneLocalOverride.cs.meta
View File

0
spine-unity/Assets/Examples/Scripts/Sample Components/CombinedSkin.cs → spine-unity/Assets/Spine Examples/Scripts/Sample Components/CombinedSkin.cs
View File

0
spine-unity/Assets/Examples/Scripts/Sample Components/CombinedSkin.cs.meta → spine-unity/Assets/Spine Examples/Scripts/Sample Components/CombinedSkin.cs.meta
View File

0
spine-unity/Assets/Examples/Scripts/Sample Components/Legacy.meta → spine-unity/Assets/Spine Examples/Scripts/Sample Components/Legacy.meta
View File

0
spine-unity/Assets/Examples/Scripts/Sample Components/Legacy/AtlasRegionAttacher.cs → spine-unity/Assets/Spine Examples/Scripts/Sample Components/Legacy/AtlasRegionAttacher.cs
View File

0
spine-unity/Assets/Examples/Scripts/Sample Components/Legacy/AtlasRegionAttacher.cs.meta → spine-unity/Assets/Spine Examples/Scripts/Sample Components/Legacy/AtlasRegionAttacher.cs.meta
View File

0
spine-unity/Assets/Examples/Scripts/Sample Components/Legacy/CustomSkin.cs → spine-unity/Assets/Spine Examples/Scripts/Sample Components/Legacy/CustomSkin.cs
View File

0
spine-unity/Assets/Examples/Scripts/Sample Components/Legacy/CustomSkin.cs.meta → spine-unity/Assets/Spine Examples/Scripts/Sample Components/Legacy/CustomSkin.cs.meta
View File

0
spine-unity/Assets/Examples/Scripts/Sample Components/Legacy/SpriteAttacher.cs → spine-unity/Assets/Spine Examples/Scripts/Sample Components/Legacy/SpriteAttacher.cs
View File

Some files were not shown because too many files have changed in this diff Show More