diff --git a/spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp b/spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp index 2401445a1..90f88b254 100644 --- a/spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp +++ b/spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp @@ -418,6 +418,8 @@ SkeletonData *SkeletonJson::readSkeletonData(const char *json) { data->_spacingMode = SpacingMode_Fixed; else if (strcmp(item, "percent") == 0) data->_spacingMode = SpacingMode_Percent; + else + data->_spacingMode = SpacingMode_Proportional; item = Json::getString(constraintMap, "rotateMode", "tangent"); if (strcmp(item, "tangent") == 0) data->_rotateMode = RotateMode_Tangent; diff --git a/spine-csharp/src/TextureRegion.cs.meta b/spine-csharp/src/TextureRegion.cs.meta new file mode 100644 index 000000000..a0851219a --- /dev/null +++ b/spine-csharp/src/TextureRegion.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 17b4075f6e1d4e5478f4730c2f4cc54d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-ts/spine-core/src/SkeletonBinary.ts b/spine-ts/spine-core/src/SkeletonBinary.ts index a628d3a6c..9596a80db 100644 --- a/spine-ts/spine-core/src/SkeletonBinary.ts +++ b/spine-ts/spine-core/src/SkeletonBinary.ts @@ -1058,7 +1058,7 @@ export class BinaryInput { let chars = ""; let charCount = 0; for (let i = 0; i < byteCount;) { - let b = this.readByte(); + let b = this.readUnsignedByte(); switch (b >> 4) { case 12: case 13: diff --git a/spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineAnimationStateGraphicTrackInspector.cs b/spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineAnimationStateGraphicTrackInspector.cs index dd362abcf..29b2ed81f 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineAnimationStateGraphicTrackInspector.cs +++ b/spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineAnimationStateGraphicTrackInspector.cs @@ -34,7 +34,7 @@ using UnityEngine; using UnityEngine.Timeline; namespace Spine.Unity.Editor { - +#if UNITY_2019_1_OR_NEWER [CustomTimelineEditor(typeof(SpineAnimationStateGraphicTrack))] [CanEditMultipleObjects] public class SpineAnimationStateGraphicTrackInspector : TrackEditor { @@ -46,4 +46,22 @@ namespace Spine.Unity.Editor { return options; } } +#else + [CustomEditor(typeof(SpineAnimationStateGraphicTrack))] + [CanEditMultipleObjects] + public class SpineAnimationStateGraphicTrackInspector : UnityEditor.Editor { + + protected SerializedProperty trackIndexProperty = null; + + public void OnEnable () { + trackIndexProperty = serializedObject.FindProperty("trackIndex"); + } + + public override void OnInspectorGUI () { + serializedObject.Update(); + EditorGUILayout.PropertyField(trackIndexProperty); + serializedObject.ApplyModifiedProperties(); + } + } +#endif } diff --git a/spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineAnimationStateTrackInspector.cs b/spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineAnimationStateTrackInspector.cs index 8cf515804..fec0d4a23 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineAnimationStateTrackInspector.cs +++ b/spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineAnimationStateTrackInspector.cs @@ -34,6 +34,7 @@ using UnityEngine; using UnityEngine.Timeline; namespace Spine.Unity.Editor { +#if UNITY_2019_1_OR_NEWER [CustomTimelineEditor(typeof(SpineAnimationStateTrack))] [CanEditMultipleObjects] public class SpineAnimationStateTrackInspector : TrackEditor { @@ -45,4 +46,22 @@ namespace Spine.Unity.Editor { return options; } } +#else + [CustomEditor(typeof(SpineAnimationStateTrack))] + [CanEditMultipleObjects] + public class SpineAnimationStateTrackInspector : UnityEditor.Editor { + + protected SerializedProperty trackIndexProperty = null; + + public void OnEnable () { + trackIndexProperty = serializedObject.FindProperty("trackIndex"); + } + + public override void OnInspectorGUI () { + serializedObject.Update(); + EditorGUILayout.PropertyField(trackIndexProperty); + serializedObject.ApplyModifiedProperties(); + } + } +#endif } diff --git a/spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineSkeletonFlipTrackInspector.cs b/spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineSkeletonFlipTrackInspector.cs index 7c43fdb99..76aaa06a1 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineSkeletonFlipTrackInspector.cs +++ b/spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineSkeletonFlipTrackInspector.cs @@ -34,6 +34,7 @@ using UnityEngine; using UnityEngine.Timeline; namespace Spine.Unity.Editor { +#if UNITY_2019_1_OR_NEWER [CustomTimelineEditor(typeof(SpineSkeletonFlipTrack))] [CanEditMultipleObjects] public class SpineSkeletonFlipTrackInspector : TrackEditor { @@ -45,4 +46,5 @@ namespace Spine.Unity.Editor { return options; } } +#endif }