From c9af18e153e784b5774ec4e29869fd0c62405159 Mon Sep 17 00:00:00 2001 From: Nathan Sweet Date: Sun, 6 Nov 2022 13:10:34 -0400 Subject: [PATCH 1/2] [libgdx] Javadoc. --- .../src/com/esotericsoftware/spine/AnimationState.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 a7d9e52cf..217602428 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java @@ -1147,7 +1147,8 @@ public class AnimationState { * {@link AnimationStateData#getMix(Animation, Animation)} based on the animation before this animation (if any). *

* A mix duration of 0 still mixes out over one frame to provide the track entry being mixed out a chance to revert the - * properties it was animating. + * properties it was animating. A mix duration of 0 can be set at any time to end the mix on the next + * {@link AnimationState#update(float) update}. *

* The mixDuration can be set manually rather than use the value from * {@link AnimationStateData#getMix(Animation, Animation)}. In that case, the mixDuration can be set for a new From f3247caee3db5f69ad729bce7a0f237059c3a857 Mon Sep 17 00:00:00 2001 From: badlogic Date: Tue, 8 Nov 2022 15:37:41 +0100 Subject: [PATCH 2/2] [cocos2dx] Explicitely link to spine-cpp, closes #2189 --- spine-cocos2dx/spine-cocos2dx.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spine-cocos2dx/spine-cocos2dx.cmake b/spine-cocos2dx/spine-cocos2dx.cmake index 7e7b3285c..beaea02ab 100644 --- a/spine-cocos2dx/spine-cocos2dx.cmake +++ b/spine-cocos2dx/spine-cocos2dx.cmake @@ -25,4 +25,4 @@ file(GLOB_RECURSE SPINE_COCOS2DX_SOURCES "${SPINE_RUNTIMES_PATH}/spine-cocos2dx/ add_library(spine-cocos2dx STATIC ${SPINE_COCOS2DX_SOURCES} ${SPINE_COCOS2DX_HEADERS}) target_include_directories(spine-cocos2dx PUBLIC "${SPINE_RUNTIMES_PATH}/spine-cpp/spine-cpp/include/") target_include_directories(spine-cocos2dx PUBLIC "${SPINE_RUNTIMES_PATH}/spine-cocos2dx/spine-cocos2dx/src/") -target_link_libraries(spine-cocos2dx PRIVATE cocos2d) \ No newline at end of file +target_link_libraries(spine-cocos2dx PRIVATE cocos2d spine-cpp) \ No newline at end of file