James Chen
67d5d7ef33
Updates console
2017-11-02 12:02:09 +08:00
James Chen
aa1819e19c
Updates cocos2d-console.
2017-10-30 11:28:47 +08:00
James Chen
fdd46f2718
Auto binds RenderTexture::saveToFile and fix js memory leak while saveToFile.
...
The callback _saveFileCallback has to be set to nullptr to release se::Value the std::function captures.
2017-10-26 12:44:06 +08:00
knoxHuang
a63e7402bc
restore getName for fireball/issues/6505
2017-10-25 18:22:15 +08:00
James Chen
3bc6e34825
Fixes crash while using PolygonCollider to make mask.
...
fixed https://github.com/cocos-creator/fireball/issues/6502
2017-10-23 15:08:46 +08:00
James Chen
8ae6d54df3
Spine conversion should use pointer instead of reference since it probably returns nullptr.
2017-10-20 10:01:04 +08:00
James Chen
f46cb75958
Merge pull request #907 from 2youyou2/native-modules
...
support native modules
2017-10-19 09:51:40 +08:00
James Chen
365f7b8329
Updates bindings-generator
2017-10-18 10:55:56 +08:00
2youyou2
5a8b02df27
Merge branch 'native-modules' of github.com:2youyouo2/cocos2d-x-lite into native-modules
2017-10-18 10:27:37 +08:00
2youyou2
790ae1fcf4
fixed windows project
2017-10-18 10:26:26 +08:00
yinkaile
5ee73c6864
fixed simulator project
2017-10-17 12:08:37 +08:00
yinkaile
8ac7257a46
fixed merge errors
2017-10-12 18:15:21 +08:00
yinkaile
d38e168441
support native modules
2017-10-12 17:35:08 +08:00
James Chen
ee9713e007
CCLOG -> CCLOGINFO in finalize callback for less log output.
2017-10-11 17:02:46 +08:00
James Chen
632448d64b
Removes COCOS2D_DEBUG definition in release mode. Adds APP_CFLAGS.
...
RuntimeJsImpl doesn't depend on COCOS_DEBUG macro.
Warning fix in bzero.
2017-10-11 14:11:41 +08:00
James Chen
e1ac3249a2
jsb_enable_debugger() uses local IP "0, 0, 0, 0", then Android debugging doesn't need to change IP.
2017-10-11 12:30:08 +08:00
James Chen
3ad08f9591
Updates submodules.
2017-10-10 16:47:55 +08:00
James Chen
0548edd7f4
Adds Simulator.entilements for mac simulator project.
2017-10-10 16:44:14 +08:00
James Chen
f3ea953638
compilation error fix for simulator.
2017-10-10 15:14:19 +08:00
James Chen
b4d7eda372
Updates simulator.
2017-10-10 14:55:20 +08:00
James Chen
412574c670
Merge branch 'develop' of git://github.com/cocos-creator/cocos2d-x-lite into jsb2.0
...
# Conflicts:
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.cpp
2017-10-10 14:48:04 +08:00
James Chen
1fe5cee080
Updates win32 simlator project to link libuv.
2017-10-10 14:37:55 +08:00
2youyouo2
2405d0c917
remove unused extensions
2017-10-10 10:30:55 +08:00
James Chen
3c74a04612
Fix compilation error while enabling libuv. Updates win32 template to remove include path of spidermonkey.
2017-10-09 17:29:13 +08:00
James Chen
c984605630
updates bindings-generator.
2017-10-09 16:38:35 +08:00
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