UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-02 13:49:07 +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-06-28 11:15:54 +02:00
commit 046c9b871a
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-as3/spine-as3/src/spine/animation/TrackEntry.as
View File

@ -100,7 +100,7 @@ package spine.animation {
var id : String = intId.toString(); var id : String = intId.toString();
var contained: Object = propertyIDs[id]; var contained: Object = propertyIDs[id];
propertyIDs[id] = true; propertyIDs[id] = true;
if (contained != undefined) { if (contained != null) {
timelineData[i] = AnimationState.SUBSEQUENT; timelineData[i] = AnimationState.SUBSEQUENT;
} else if (to == null || !to.hasTimeline(intId)) { } else if (to == null || !to.hasTimeline(intId)) {
timelineData[i] = AnimationState.FIRST; timelineData[i] = AnimationState.FIRST;

1
spine-libgdx/spine-libgdx/pom.xml
View File

@ -12,6 +12,7 @@
<packaging>jar</packaging> <packaging>jar</packaging>
<version>3.7.0.1-SNAPSHOT</version> <version>3.7.0.1-SNAPSHOT</version>
<name>spine-libgdx</name> <name>spine-libgdx</name>
<description>Spine Runtime for libGDX</description> <description>Spine Runtime for libGDX</description>
<url>http://github.com/esotericsoftware/spine-runtimes</url> <url>http://github.com/esotericsoftware/spine-runtimes</url>