mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-20 23:52:40 +08:00
7653cb453f
# Conflicts: # build/cocos2d_libs.xcodeproj/project.pbxproj # cocos/2d/libcocos2d.vcxproj.filters # cocos/Android.mk # cocos/editor-support/creator/CCCameraNode.cpp # cocos/editor-support/creator/physics/CCPhysicsAABBQueryCallback.cpp # cocos/editor-support/creator/physics/CCPhysicsAABBQueryCallback.h # cocos/network/SocketIO.cpp # cocos/network/WebSocket-libwebsockets.cpp # cocos/renderer/CCTextureCache.cpp # cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js # cocos/scripting/js-bindings/auto/jsb_box2d_auto.cpp # cocos/scripting/js-bindings/auto/jsb_box2d_auto.hpp # cocos/scripting/js-bindings/auto/jsb_cocos2dx_audioengine_auto.cpp # cocos/scripting/js-bindings/auto/jsb_cocos2dx_audioengine_auto.hpp # cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp # cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp # cocos/scripting/js-bindings/auto/jsb_cocos2dx_dragonbones_auto.cpp # cocos/scripting/js-bindings/auto/jsb_cocos2dx_dragonbones_auto.hpp # cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_video_auto.cpp # cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_video_auto.hpp # cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_webView_auto.cpp # cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_webView_auto.hpp # cocos/scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.cpp # cocos/scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.hpp # cocos/scripting/js-bindings/auto/jsb_cocos2dx_network_auto.cpp # cocos/scripting/js-bindings/auto/jsb_cocos2dx_network_auto.hpp # cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.cpp # cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.hpp # cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.cpp # cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.hpp # cocos/scripting/js-bindings/auto/jsb_creator_auto.cpp # cocos/scripting/js-bindings/auto/jsb_creator_auto.hpp # cocos/scripting/js-bindings/manual/JavaScriptJavaBridge.h # cocos/scripting/js-bindings/manual/JavaScriptObjCBridge.h # cocos/scripting/js-bindings/manual/ScriptingCore.cpp # cocos/scripting/js-bindings/manual/ScriptingCore.h # cocos/scripting/js-bindings/manual/box2d/js_bindings_box2d_manual.cpp # cocos/scripting/js-bindings/manual/box2d/js_bindings_box2d_manual.h # cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp # cocos/scripting/js-bindings/manual/cocos2d_specifics.hpp # cocos/scripting/js-bindings/manual/creator/js_bindings_creator_manual.cpp # cocos/scripting/js-bindings/manual/dragonbones/jsb_cocos2dx_dragonbones_manual.cpp # cocos/scripting/js-bindings/manual/dragonbones/jsb_cocos2dx_dragonbones_manual.h # cocos/scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_video_manual.cpp # cocos/scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_webView_manual.cpp # cocos/scripting/js-bindings/manual/extension/jsb_cocos2dx_extension_manual.cpp # cocos/scripting/js-bindings/manual/js_bindings_config.h # cocos/scripting/js-bindings/manual/js_bindings_opengl.cpp # cocos/scripting/js-bindings/manual/js_manual_conversions.cpp # cocos/scripting/js-bindings/manual/js_manual_conversions.h # cocos/scripting/js-bindings/manual/js_module_register.cpp # cocos/scripting/js-bindings/manual/js_module_register.h # cocos/scripting/js-bindings/manual/jsb_event_dispatcher_manual.cpp # cocos/scripting/js-bindings/manual/jsb_event_dispatcher_manual.h # cocos/scripting/js-bindings/manual/jsb_helper.h # cocos/scripting/js-bindings/manual/jsb_opengl_functions.cpp # cocos/scripting/js-bindings/manual/jsb_opengl_functions.h # cocos/scripting/js-bindings/manual/jsb_opengl_manual.cpp # cocos/scripting/js-bindings/manual/jsb_opengl_manual.h # cocos/scripting/js-bindings/manual/jsb_opengl_registration.cpp # cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_functions.cpp # cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_functions.h # cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_registration.cpp # cocos/scripting/js-bindings/manual/network/XMLHTTPRequest.cpp # cocos/scripting/js-bindings/manual/network/js_network_manual.cpp # cocos/scripting/js-bindings/manual/network/js_network_manual.h # cocos/scripting/js-bindings/manual/network/jsb_socketio.cpp # cocos/scripting/js-bindings/manual/network/jsb_websocket.cpp # cocos/scripting/js-bindings/manual/platform/android/CCJavascriptJavaBridge.cpp # cocos/scripting/js-bindings/manual/platform/android/CCJavascriptJavaBridge.h # cocos/scripting/js-bindings/manual/platform/ios/JavaScriptObjCBridge.h # cocos/scripting/js-bindings/manual/platform/ios/JavaScriptObjCBridge.mm # cocos/scripting/js-bindings/manual/spidermonkey_specifics.h # cocos/scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.cpp # cocos/scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.h # cocos/scripting/js-bindings/manual/ui/jsb_cocos2dx_ui_manual.cpp # cocos/scripting/js-bindings/proj.android/Android.mk # cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj # cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj # cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj.filters # cocos/scripting/js-bindings/script/jsb_boot.js # tools/bindings-generator # tools/tojs/cocos2dx.ini # tools/tojs/genbindings.py