update new version #4
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
Conflicts: frameworks/js-bindings/bindings/manual/cocos2d_specifics.cpp frameworks/js-bindings/bindings/manual/cocostudio/jsb_cocos2dx_studio_manual.cpp frameworks/js-bindings/bindings/manual/js_manual_conversions.cpp frameworks/js-bindings/bindings/manual/js_manual_conversions.h frameworks/js-bindings/bindings/manual/network/XMLHTTPRequest.cpp
Conflicts: frameworks/js-bindings/bindings/auto/api/jsb_cocos2dx_auto_api.js frameworks/js-bindings/bindings/auto/api/jsb_cocos2dx_extension_auto_api.js frameworks/js-bindings/bindings/auto/api/jsb_cocos2dx_ui_auto_api.js frameworks/js-bindings/bindings/auto/jsb_cocos2dx_auto.cpp frameworks/js-bindings/bindings/auto/jsb_cocos2dx_auto.hpp frameworks/js-bindings/bindings/auto/jsb_cocos2dx_extension_auto.cpp frameworks/js-bindings/bindings/auto/jsb_cocos2dx_extension_auto.hpp frameworks/js-bindings/bindings/auto/jsb_cocos2dx_ui_auto.cpp frameworks/js-bindings/bindings/auto/jsb_cocos2dx_ui_auto.hpp frameworks/js-bindings/bindings/manual/chipmunk/js_bindings_chipmunk_auto_classes.cpp frameworks/js-bindings/bindings/manual/extension/jsb_cocos2dx_extension_manual.cpp frameworks/js-bindings/bindings/manual/extension/jsb_cocos2dx_extension_manual.h frameworks/js-bindings/bindings/script/extension/jsb_cocos2d_extension.js frameworks/js-bindings/bindings/script/jsb_ext_create_apis.js frameworks/js-bindings/cocos2d-x samples/js-tests/project/Classes/AppDelegate.h samples/js-tests/project/proj.ios/AppController.mm tools/tojs/cocos2dx.ini
update spidermonkey 33
Fix bugs in binding code for spidermonkey33
Fix error of cc.Label.createWithTTF undefined
Fixed a bug of template that it doesn't work when it doesn't add loading.js
Moved loading.js to res folder for Cocos console release mode.
Fixed a bug of Cocostudio parser that widget doesn't set layoutComponent
…ImproveBindings Conflicts: frameworks/js-bindings/bindings/manual/cocos2d_specifics.cpp
Improve bindings and upgrade to SpiderMonkey v34 for iOS
[AUTO] : updating jsbinding automatically
Fix armature setBlendFunc parameter inconsistency
add cocos attr to the script element in templates
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.
update new version