UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-25 19:21:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.1' into 4.2-beta

Browse Source
This commit is contained in:
badlogic 2022-11-08 15:37:54 +01:00
commit 9971d1ed0b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-cocos2dx/spine-cocos2dx.cmake
View File

@ -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}) 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-cpp/spine-cpp/include/")
target_include_directories(spine-cocos2dx PUBLIC "${SPINE_RUNTIMES_PATH}/spine-cocos2dx/spine-cocos2dx/src/") target_include_directories(spine-cocos2dx PUBLIC "${SPINE_RUNTIMES_PATH}/spine-cocos2dx/spine-cocos2dx/src/")
target_link_libraries(spine-cocos2dx PRIVATE cocos2d) target_link_libraries(spine-cocos2dx PRIVATE cocos2d spine-cpp)

3
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java
View File

@ -1151,7 +1151,8 @@ public class AnimationState {
* {@link AnimationStateData#getMix(Animation, Animation)} based on the animation before this animation (if any). * {@link AnimationStateData#getMix(Animation, Animation)} based on the animation before this animation (if any).
* <p> * <p>
* A mix duration of 0 still mixes out over one frame to provide the track entry being mixed out a chance to revert the * 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}.
* <p> * <p>
* The <code>mixDuration</code> can be set manually rather than use the value from * The <code>mixDuration</code> can be set manually rather than use the value from
* {@link AnimationStateData#getMix(Animation, Animation)}. In that case, the <code>mixDuration</code> can be set for a new * {@link AnimationStateData#getMix(Animation, Animation)}. In that case, the <code>mixDuration</code> can be set for a new