diff --git a/spine-cocos2dx/example/proj.ios_mac/spine-cocos2d-x.xcodeproj/project.pbxproj b/spine-cocos2dx/example/proj.ios_mac/spine-cocos2d-x.xcodeproj/project.pbxproj
index 4cbf3ce2d..50f1e7db3 100644
--- a/spine-cocos2dx/example/proj.ios_mac/spine-cocos2d-x.xcodeproj/project.pbxproj
+++ b/spine-cocos2dx/example/proj.ios_mac/spine-cocos2d-x.xcodeproj/project.pbxproj
@@ -1068,6 +1068,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
COMPRESS_PNG_FILES = NO;
ENABLE_BITCODE = NO;
+ "EXCLUDED_ARCHS[sdk=*]" = arm64;
GCC_DYNAMIC_NO_PIC = NO;
GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -1080,7 +1081,7 @@
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
HEADER_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = ios/Info.plist;
- IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LIBRARY_SEARCH_PATHS = "";
OTHER_LDFLAGS = (
"$(_COCOS_LIB_IOS_BEGIN)",
@@ -1089,7 +1090,7 @@
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(_COCOS_HEADER_IOS_BEGIN) $(_COCOS_HEADER_IOS_END)";
- VALID_ARCHS = "arm64 armv7";
+ VALID_ARCHS = "$(ARCHS_STANDARD)";
};
name = Debug;
};
@@ -1110,7 +1111,7 @@
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
HEADER_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = ios/Info.plist;
- IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LIBRARY_SEARCH_PATHS = "";
OTHER_LDFLAGS = (
"$(_COCOS_LIB_IOS_BEGIN)",
@@ -1119,7 +1120,7 @@
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "$(_COCOS_HEADER_IOS_BEGIN) $(_COCOS_HEADER_IOS_END)";
- VALID_ARCHS = "arm64 armv7";
+ VALID_ARCHS = "$(ARCHS_STANDARD)";
};
name = Release;
};
diff --git a/spine-csharp/src/AnimationState.cs b/spine-csharp/src/AnimationState.cs
index 0da0475e5..69d306f0c 100644
--- a/spine-csharp/src/AnimationState.cs
+++ b/spine-csharp/src/AnimationState.cs
@@ -87,6 +87,10 @@ namespace Spine {
internal void OnEvent (TrackEntry entry, Event e) { if (Event != null) Event(entry, e); }
public delegate void TrackEntryDelegate (TrackEntry trackEntry);
+ /// See
+ /// API Reference documentation pages here for details. Usage in C# and spine-unity is explained
+ /// here
+ /// on the spine-unity documentation pages.
public event TrackEntryDelegate Start, Interrupt, End, Dispose, Complete;
public delegate void TrackEntryEventDelegate (TrackEntry trackEntry, Event e);
@@ -960,6 +964,10 @@ namespace Spine {
internal TrackEntry previous, next, mixingFrom, mixingTo;
// difference to libgdx reference: delegates are used for event callbacks instead of 'AnimationStateListener listener'.
+ /// See
+ /// API Reference documentation pages here for details. Usage in C# and spine-unity is explained
+ /// here
+ /// on the spine-unity documentation pages.
public event AnimationState.TrackEntryDelegate Start, Interrupt, End, Dispose, Complete;
public event AnimationState.TrackEntryEventDelegate Event;
internal void OnStart () { if (Start != null) Start(this); }
diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java
index b27bd42bb..b53b551cd 100644
--- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java
+++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java
@@ -1329,28 +1329,37 @@ public class AnimationState {
* See TrackEntry {@link TrackEntry#setListener(AnimationStateListener)} and AnimationState
* {@link AnimationState#addListener(AnimationStateListener)}. */
static public interface AnimationStateListener {
- /** Invoked when this entry has been set as the current entry. */
+ /** Invoked when this entry has been set as the current entry. {@link #end(TrackEntry)} will occur when this entry will no
+ * longer be applied. */
public void start (TrackEntry entry);
/** Invoked when another entry has replaced this entry as the current entry. This entry may continue being applied for
* mixing. */
public void interrupt (TrackEntry entry);
- /** Invoked when this entry is no longer the current entry and will never be applied again. */
+ /** Invoked when this entry will never be applied again. This only occurs if this entry has previously been set as the
+ * current entry ({@link #start(TrackEntry)} was invoked). */
public void end (TrackEntry entry);
/** Invoked when this entry will be disposed. This may occur without the entry ever being set as the current entry.
+ *
* References to the entry should not be kept after dispose is called, as it may be destroyed or reused. */
public void dispose (TrackEntry entry);
- /** Invoked every time this entry's animation completes a loop. Because this event is trigged in
- * {@link AnimationState#apply(Skeleton)}, any animations set in response to the event won't be applied until the next time
- * the AnimationState is applied. */
+ /** Invoked every time this entry's animation completes a loop. This may occur during mixing (after
+ * {@link #interrupt(TrackEntry)}).
+ *
+ * If this entry's {@link TrackEntry#getMixingTo()} is not null, this entry is mixing out (it is not the current entry).
+ *
+ * Because this event is triggered at the end of {@link AnimationState#apply(Skeleton)}, any animations set in response to
+ * the event won't be applied until the next time the AnimationState is applied. */
public void complete (TrackEntry entry);
- /** Invoked when this entry's animation triggers an event. Because this event is trigged in
- * {@link AnimationState#apply(Skeleton)}, any animations set in response to the event won't be applied until the next time
- * the AnimationState is applied. */
+ /** Invoked when this entry's animation triggers an event. This may occur during mixing (after
+ * {@link #interrupt(TrackEntry)}), see {@link TrackEntry#eventThreshold}.
+ *
+ * Because this event is triggered at the end of {@link AnimationState#apply(Skeleton)}, any animations set in response to
+ * the event won't be applied until the next time the AnimationState is applied. */
public void event (TrackEntry entry, Event event);
}
diff --git a/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/JsonRollback.java b/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/JsonRollback.java
index 6c6d14970..356200860 100644
--- a/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/JsonRollback.java
+++ b/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/JsonRollback.java
@@ -197,7 +197,7 @@ public class JsonRollback {
}
if (name.equals("rgba"))
map.parent.name = "color";
- else if (name.equals("rgba")) //
+ else if (name.equals("rgba2")) //
map.parent.name = "twoColor";
}
}