Merge branch '4.0' into 4.1-beta

spine-cpp/spine-cpp/include/spine/Extension.h

@@ -104,15 +104,15 @@ namespace spine {
 		virtual ~DefaultSpineExtension();
 
 	protected:
-		virtual void *_alloc(size_t size, const char *file, int line);
+		virtual void *_alloc(size_t size, const char *file, int line) override;
 
-		virtual void *_calloc(size_t size, const char *file, int line);
+		virtual void *_calloc(size_t size, const char *file, int line) override;
 
-		virtual void *_realloc(void *ptr, size_t size, const char *file, int line);
+		virtual void *_realloc(void *ptr, size_t size, const char *file, int line) override;
 
-		virtual void _free(void *mem, const char *file, int line);
+		virtual void _free(void *mem, const char *file, int line) override;
 
-		virtual char *_readFile(const String &path, int *length);
+		virtual char *_readFile(const String &path, int *length) override;
 	};
 
 // This function is to be implemented by engine specific runtimes to provide

spine-unity/Modules/com.esotericsoftware.spine.timeline/Documentation/README.md

@@ -58,6 +58,7 @@ You can add a `Spine Animation State Clip` to a `SkeletonAnimation Track` (or `S
 - *Event Threshold.* See [TrackEntry.EventThreshold](http://esotericsoftware.com/spine-api-reference#TrackEntry-eventThreshold).
 - *Attachment Threshold.* See [TrackEntry.AttachmentThreshold](http://esotericsoftware.com/spine-api-reference#TrackEntry-attachmentThreshold).
 - *Draw Order Threshold.* See [TrackEntry.DrawOrderThreshold](http://esotericsoftware.com/spine-api-reference#TrackEntry-drawOrderThreshold).
+- *Alpha.* See [TrackEntry.Alpha](http://esotericsoftware.com/spine-api-reference#TrackEntry-alpha).
 
 *Ignored Parameters*
 - *Ease Out Duration, Blend Curves*. These parameters are ignored and have no effect.
@@ -111,5 +112,3 @@ This track type can be used to flip the skeleton of the target `SkeletonAnimatio
 
 #### Known Issues
 - The Console potentially logs an incorrect and harmless error `DrivenPropertyManager has failed to register property "m_Script" of object "Spine GameObject (spineboy-pro)" with driver "" because the property doesn't exist.`. This is a known issue on Unity's end. See more here: https://forum.unity.com/threads/default-playables-text-switcher-track-error.502903/
-
-