James Chen
8b1ba02f9f
Implements seval_to_TTFConfig, don't ignore createWithTTF and setTTFConfig in auto bindings.
2017-09-23 17:53:24 +08:00
James Chen
db53549dfc
Adds anysdk bindings configuration.
2017-09-22 17:39:00 +08:00
James Chen
b4b07dbf99
Duplicated which will cause simulator compilation failed in release mode. ( #833 )
...
* Duplicated which will cause simulator compilation failed in release mode.
It comes from https://github.com/cocos-creator/cocos2d-x-lite/pull/700
* Simulator project fix for android.
* Updates cocos2d-console.
2017-09-20 22:08:42 -05:00
James Chen
753c1fa352
Updates cocos2d-console and a warning fix in UrlAudioPlayer.cpp
2017-09-21 09:38:07 +08:00
James Chen
b3018f029d
update win32 simulator project configuration. ( #831 )
2017-09-20 05:07:03 -05:00
2youyouo2
6771164c5d
remove unused ccui
2017-09-18 18:16:51 +08:00
James Chen
7539ccdad5
Merge pull request #819 from dumganhar/jsb2.0
...
[android] Fixes AppAcitivity (Sub class of Cocos2dxActivity) is re-created which causes crash if launching app first time and re-opening from icon.
2017-09-15 03:50:43 -05:00
James Chen
36b79452a2
update bindings-generator.
2017-09-15 10:47:03 +08:00
James Chen
f19fb0b1f8
[android] Fixes AppAcitivity (Sub class of Cocos2dxActivity) is re-created which causes crash if launching app first time and re-opening from icon.
2017-09-15 10:41:32 +08:00
pandamicro
7fe7d44a75
Update Texture2D js APIs
2017-09-15 10:25:29 +08:00
James Chen
f21fea4344
executeScriptBuffer -> evalString, executeScriptFile -> runScript.
2017-08-31 15:00:23 +08:00
James Chen
df01303041
attachChild -> attachObject, detachChild -> detachObject, isSame -> strictEquals
2017-08-31 10:33:17 +08:00
James Chen
4889a7f358
updates simulator project configuration.
2017-08-29 18:01:53 +08:00
James Chen
9f16c51b4e
Simulator works for jsb2.0
2017-08-29 18:00:07 +08:00
James Chen
99c1b24256
Merge branch 'develop' into jsb2.0
2017-08-28 14:38:47 +08:00
James Chen
621ff28b4a
Merge branch 'v1.6' into develop
...
# Conflicts:
# cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js
# 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_experimental_webView_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_webView_auto.hpp
# cocos/scripting/js-bindings/manual/BaseJSAction.cpp
# cocos/scripting/js-bindings/manual/BaseJSAction.h
# cocos/scripting/js-bindings/manual/ScriptingCore.cpp
# cocos/scripting/js-bindings/manual/ScriptingCore.h
# cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
# cocos/scripting/js-bindings/manual/cocos2d_specifics.hpp
# cocos/scripting/js-bindings/manual/js_manual_conversions.cpp
# cocos/scripting/js-bindings/manual/network/XMLHTTPRequest.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/ios/JavaScriptObjCBridge.mm
# cocos/scripting/js-bindings/manual/spidermonkey_specifics.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_debugger.js
# extensions/anysdk/js-bindings/SDKManager.cpp
# extensions/anysdk/js-bindings/manualanysdkbindings.cpp
# templates/cocos2dx_files.json
# templates/js-template-binary/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm
# templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm
# templates/js-template-link/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm
# tools/tojs/cocos2dx.ini
# tools/tojs/cocos2dx_experimental_webView.ini
2017-08-28 14:23:30 +08:00
James Chen
3d5b98b8a0
Refactor the order of class (Node, Label, Sprite) member for saving more memory.
...
More enum of char elements for saving more memory.
EventTouch and EventMouse are cached.
releaseScriptObject for scene should be placed at setNextScene.
Fixes protential crash while gc comes for JSC and ChakraCore.
Adds assertion in ScriptingCore::releaseScriptObject for not being invoked while gc.
Scheduler binding fix.
2017-08-28 14:03:33 +08:00
pandamicro
d96dd13300
Merge pull request #769 from pandamicro/v1.6
...
Fix issue with ScriptingCore::getFileScript modif
2017-08-21 11:20:39 +08:00
pandamicro
935b7a94db
Fix issue with ScriptingCore::getFileScript modif
2017-08-21 11:10:39 +08:00
James Chen
fa594d7616
updates creator.ini
2017-08-18 16:15:50 +08:00
James Chen
ce7c78a857
updates external and bindings-generator.
2017-08-18 14:34:55 +08:00
James Chen
b2ff785501
updates bindings-generator.
2017-08-18 14:34:55 +08:00
knoxHuang
0e5127fee1
Merge remote-tracking branch 'origin/v1.6' into v1.6
2017-08-16 17:20:57 +08:00
knoxHuang
53941d8df8
add setJavascriptInterfaceScheme and setOnJSCallback to webview for fireball/issues/6251
2017-08-16 17:20:34 +08:00
James Chen
dbe9716536
Adds BaseJSAction
2017-08-16 15:41:27 +08:00
2youyou2
40812d7000
support debug windows simulator
2017-08-15 17:54:03 +08:00
James Chen
0fe0580b5f
deletes unused files.
2017-08-11 11:42:13 +08:00
James Chen
6b9cbbab28
cleanup.
2017-08-11 10:14:45 +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
805ef6535a
updates cocos2d-console
2017-08-10 17:36:40 +08:00
James Chen
b127fa0ca4
inspector works for windows.
2017-08-10 10:48:47 +08:00
James Chen
b4f62fe05b
don't bind simple audio engine.
2017-08-10 09:25:54 +08:00
James Chen
64f6b95b71
adds v8 inspector code from Nodejs
2017-08-04 16:53:11 +08:00
knoxHuang
a14c83d712
fix Follow isDone error for fireball/issues/6191
2017-08-04 16:06:20 +08:00
James Chen
3b0bbfb226
update bindings-generator.
2017-08-03 17:29:19 +08:00
James Chen
708cf876fc
b2Shape need to be owned by cpp since b2Shape is abstract and GetShape will return its sub class instance which is owned by cpp. Therefore it has to be rooted.
2017-08-03 13:46:53 +08:00
James Chen
24136c2133
Arguments root stuff fix.
2017-08-03 11:47:18 +08:00
pandamicro
b39dba1c63
Fix simulator restart crash issue
2017-08-02 18:14:29 +08:00
James Chen
e5eac44c0f
cleanup
2017-08-02 14:41:10 +08:00
James Chen
fe1cfbd265
update ini.
2017-08-02 14:38:05 +08:00
James Chen
854aa81c0d
JSB_PRECONDITION2->SE_PRECONDITION2
2017-07-31 10:57:59 +08:00
James Chen
9e577338f2
updates bindings-generator.
2017-07-31 10:41:02 +08:00
2youyouo2
a2d0955bed
should use v140 for 15.0 VisualStudioVersion
2017-07-26 16:08:01 +08:00
James Chen
d187d23998
updates bindings-generator
2017-07-20 17:53:02 +08:00
James Chen
b3db0a842a
add modules register
2017-07-12 11:15:46 +08:00
pandamicro
9234bdf0bc
Merge pull request #704 from pandamicro/develop
...
Small fixes
2017-07-11 15:36:37 +08:00
pandamicro
09cb88821b
Fix small issues in simulator win32 project
2017-07-11 15:36:04 +08:00
James Chen
2808497a88
clearException after manually registration.
2017-07-11 13:40:04 +08:00
pandamicro
869ee6c185
fix vs 2017 compilation issue with spidermonkey
2017-07-11 00:52:37 +08:00
James Chen
b8c1493850
socketio bindings ok, and fix some bugs of socketio.
2017-07-10 16:40:33 +08:00