Solve the error logic in spine runtime. #17448
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sync the runtime to the state of this commit (both js & cpp runtime): EsotericSoftware/spine-runtimes@3ced1e1
stevetranby
added a commit
to stevetranby/cocos2d-x
that referenced
this pull request
Mar 9, 2017
…futurePRs * commit '5c0c6d2e1e4b1772efc239d23f8cdaf8ce79a898': More powerful Uri class, adds unit test for Uri class. Refactors some code in SocketIO & Websocket. (cocos2d#17472) Prevent signed/unsigned mismatch (cocos2d#17468) fix the issue that onEnterTransitionDidFinish() is not invoked at first scene change (cocos2d#17466) csbload error bug (cocos2d#17465) *Fix: GLThread and other threads access sDownloaderMap in a thread-unsafe way, which will result in crash in some occasion on Android. (cocos2d#16326) fixed cocos2d#17416: Wrong default port of SocketIO connection. (cocos2d#17459) [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#17458) fixed cocos2d#17427: lws_parse_url has wrong behavior, it parses ’ws://domain.com/abc/d’ to ‘path: abc/d’ rather than ‘path: /adb/d’. (cocos2d#17455) [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#17456) Prevent unexpected calls to unscheduled selector in long updates. (cocos2d#17431) fix the broken of lua-tests after PR cocos2d#17445 was merged. (cocos2d#17454) [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#17453) Solve the error logic in spine runtime. (cocos2d#17448) cocos2d::Sequence::isDone() checks that the last action is actually done. (cocos2d#17437) Websocket bug fix after PR#17440 was merged. (cocos2d#17450) [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#17449) Some fixes for search paths: (cocos2d#17435) update external version (cocos2d#17446) fixed cocos2d#17433: [webSocket ] webSocket random crash in win32 (cocos2d#17440) Fix some local variable names in tests (cocos2d#17445) # Conflicts: # web
dumganhar
reviewed
Aug 30, 2017
| @@ -414,7 +415,8 @@ float _spAnimationState_applyMixingFrom (spAnimationState* self, spTrackEntry* e | |||
| } | |||
| } | |||
|
|
|||
| _spAnimationState_queueEvents(self, from, animationTime); | |||
| if (entry->mixDuration > 0) _spAnimationState_queueEvents(self, from, animationTime); | |||
| internal->eventsCount = 0; | |||
There was a problem hiding this comment.
@natural-law , I didn't find this changes in the link (EsotericSoftware/spine-runtimes@3ced1e1) you mentioned.
Did you paste a wrong url? I also compared the code in spine runtime and found there are not this changes in 3.5.35 spine runtime.
There was a problem hiding this comment.
Sorry for the wrong information. The correct related commit is:
EsotericSoftware/spine-runtimes@c512ee5
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Sync the runtime to the state of this commit (both js & cpp runtime):
EsotericSoftware/spine-runtimes@3ced1e1