James Chen
|
e7dfb3b0ea
|
updates anysdk binding.
|
2017-08-14 16:31:15 +08:00 |
|
James Chen
|
8e15bc10e8
|
Anysdk binding code updated.
|
2017-08-14 16:01:16 +08:00 |
|
James Chen
|
0fe0580b5f
|
deletes unused files.
|
2017-08-11 11:42:13 +08:00 |
|
pandamicro
|
d2856798eb
|
Fix arm64 crash during restart
|
2017-08-11 11:29:01 +08:00 |
|
James Chen
|
e55e68fc71
|
Fixes compilation errors for android x86 audio module and fixes a typo
|
2017-08-11 10:24:05 +08:00 |
|
James Chen
|
c99f9f47b9
|
fix typo in win32/AudioCache.h
|
2017-08-11 10:17:58 +08:00 |
|
James Chen
|
6b9cbbab28
|
cleanup.
|
2017-08-11 10:14:45 +08:00 |
|
James Chen
|
e13c1ffed3
|
fix warning generated by vs2015.
|
2017-08-11 09:47:49 +08:00 |
|
James Chen
|
84d7dc54bc
|
Initializes _cameraInstance with nullptr.
|
2017-08-11 09:38:10 +08:00 |
|
James Chen
|
101b763c0f
|
Fixes compilation errors after merging develop branch.
|
2017-08-11 09:29:39 +08:00 |
|
James Chen
|
7653cb453f
|
Merge branch 'develop' of git://github.com/cocos-creator/cocos2d-x-lite into jsb2.0
# 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
|
2017-08-10 18:04:24 +08:00 |
|
James Chen
|
43d0fb1e24
|
updates xcode project configuration.
|
2017-08-10 17:37:29 +08:00 |
|
James Chen
|
805ef6535a
|
updates cocos2d-console
|
2017-08-10 17:36:40 +08:00 |
|
James Chen
|
404d5571e3
|
disable v8 inspector.
|
2017-08-10 17:35:32 +08:00 |
|
James Chen
|
5359a866c8
|
Adds comments for set_host_name.
|
2017-08-10 16:57:15 +08:00 |
|
James Chen
|
7689280109
|
cleanup.
|
2017-08-10 16:56:14 +08:00 |
|
James Chen
|
2f8bc2529e
|
Event class should be new ed.
|
2017-08-10 16:56:03 +08:00 |
|
James Chen
|
e719caa583
|
updates android.mk
|
2017-08-10 16:55:40 +08:00 |
|
James Chen
|
ec159591d0
|
removes unused functions in bitops.h
|
2017-08-10 16:55:25 +08:00 |
|
James Chen
|
675df73533
|
update HttpClient-android.cpp
|
2017-08-10 16:55:12 +08:00 |
|
James Chen
|
2d770fcd8d
|
fprintf -> LOGD
|
2017-08-10 16:54:55 +08:00 |
|
James Chen
|
00fc1596a0
|
updates debugger prompt.
|
2017-08-10 11:20:45 +08:00 |
|
James Chen
|
f56713382d
|
Adds v8 README.md for node inspector version
|
2017-08-10 11:14:35 +08:00 |
|
James Chen
|
6b5f6eba3a
|
__POSIX__ macro definition.
|
2017-08-10 11:14:13 +08:00 |
|
James Chen
|
51e7f0962b
|
inspector code in config.
|
2017-08-10 11:00:54 +08:00 |
|
James Chen
|
b127fa0ca4
|
inspector works for windows.
|
2017-08-10 10:48:47 +08:00 |
|
James Chen
|
7e7a94a3cc
|
Merge branch 'jsb2.0' of https://github.com/dumganhar/cocos2d-x-lite into jsb2.0
|
2017-08-10 10:36:26 +08:00 |
|
James Chen
|
23ce8e2c68
|
Adds SHA1 code which is in firefox.
|
2017-08-10 10:35:52 +08:00 |
|
James Chen
|
5656b8ec77
|
update line ending format for CCApplication-win32.cpp
|
2017-08-10 09:36:57 +08:00 |
|
James Chen
|
b4f62fe05b
|
don't bind simple audio engine.
|
2017-08-10 09:25:54 +08:00 |
|
James Chen
|
e86ed76abf
|
jsb2.0 windows works on v8.
|
2017-08-09 18:06:33 +08:00 |
|
James Chen
|
e51e4d51bb
|
websocket text response fix and update v8
|
2017-08-09 16:11:23 +08:00 |
|
pandamicro
|
1d79eecc6e
|
Fix crash issue during closing if scene has a label outline component
|
2017-08-09 14:50:54 +08:00 |
|
pandamicro
|
20d121f31f
|
Merge pull request #749 from pandamicro/v1.6
Ultimate fix for anysdk restart crash issue
|
2017-08-08 17:16:22 +08:00 |
|
pandamicro
|
296d425a8d
|
Ultimate fix for anysdk restart crash issue
|
2017-08-08 17:13:23 +08:00 |
|
James Chen
|
1a26f52b4c
|
cleanup.
|
2017-08-08 16:18:48 +08:00 |
|
James Chen
|
6b28dddb92
|
cleanup.
|
2017-08-08 16:01:37 +08:00 |
|
James Chen
|
d7c6a207f5
|
update project.
|
2017-08-08 11:55:09 +08:00 |
|
pandamicro
|
3c64cfd7c0
|
Merge pull request #748 from pandamicro/v1.6
Fix JavaScriptObjCBridge::callStaticMethod
|
2017-08-08 11:24:43 +08:00 |
|
pandamicro
|
ce8be5e24a
|
Fix JavaScriptObjCBridge::callStaticMethod
|
2017-08-08 11:22:06 +08:00 |
|
James Chen
|
cb5d3066a8
|
Web inspector for JSC works.
|
2017-08-08 10:23:17 +08:00 |
|
pandamicro
|
542239291b
|
Merge pull request #747 from pandamicro/v1.6
Fix JSB Scheduler->unschedule issue when target have multiple callbacks
|
2017-08-08 00:11:13 +08:00 |
|
pandamicro
|
f4d08c199d
|
Fix JSB Scheduler->unschedule issue when target have multiple callbacks
|
2017-08-08 00:07:06 +08:00 |
|
CocosRobot
|
9d612678f6
|
[ci skip][AUTO]: updating jsbinding automatically
|
2017-08-07 10:36:14 +00:00 |
|
pandamicro
|
80dac85639
|
Fix network crashing issue during restart
|
2017-08-07 18:30:51 +08:00 |
|
pandamicro
|
ff4ca61919
|
Fix anysdk restart issue with old listeners
|
2017-08-07 16:51:09 +08:00 |
|
James Chen
|
b398292431
|
Removes deprecated api for httprequest. cleanup xmlhttprequest.
|
2017-08-07 15:00:29 +08:00 |
|
pandamicro
|
0bd1c81d80
|
Fix RootedObject on stack being deallocated after ScriptingCore::cleanup
|
2017-08-07 14:37:17 +08:00 |
|
pandamicro
|
02db3adf58
|
Fix XMLHttpRequest timeout setter issue
|
2017-08-07 12:09:42 +08:00 |
|
CocosRobot
|
5e085a607a
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2017-08-04 10:47:32 +00:00 |
|