pandamicro
|
67f08532ce
|
Fix closing app crash in websocket finalize
|
2017-08-21 22:46:34 +08:00 |
|
pandamicro
|
c37ee5e8c5
|
Merge branch 'v1.6' of github.com:cocos-creator/cocos2d-x-lite into v1.6
# Conflicts:
# cocos/scripting/js-bindings/manual/network/jsb_websocket.cpp
|
2017-08-21 22:40:32 +08:00 |
|
pandamicro
|
d32a731cac
|
Fix network binding issues
|
2017-08-21 22:27:59 +08:00 |
|
James Chen
|
7268053a4f
|
SpiderMonkey bytecode works again.
|
2017-08-21 18:10:10 +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 |
|
Wang Nan
|
476d602104
|
Merge pull request #768 from pandamicro/v1.6
Fix JSB_EditboxDelegate crash if js delegate has already been garbage collected
|
2017-08-19 16:50:25 +08:00 |
|
pandamicro
|
2849592a25
|
Fix JSB_EditboxDelegate crash if js delegate has already been garbage collected
|
2017-08-18 16:24:28 +08:00 |
|
CocosRobot
|
228e10c36d
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2017-08-18 08:21:50 +00:00 |
|
James Chen
|
fa594d7616
|
updates creator.ini
|
2017-08-18 16:15:50 +08:00 |
|
James Chen
|
a5279993b9
|
updates project configuration for win32.
|
2017-08-18 16:05:22 +08:00 |
|
James Chen
|
5d01973c25
|
Updates config.json.
|
2017-08-18 16:05:15 +08:00 |
|
James Chen
|
41eae72bd8
|
Adds global variable 'window' for jsc and cleanup.
|
2017-08-18 16:03:04 +08:00 |
|
James Chen
|
c82048bdea
|
Updates Android.mk
|
2017-08-18 15:32:25 +08:00 |
|
pandamicro
|
a9d5acf683
|
Merge pull request #763 from pandamicro/v1.6
Return empty string for nullptr in c_string_to_jsval
|
2017-08-18 14:59:06 +08:00 |
|
pandamicro
|
f969e724af
|
Return empty string for nullptr in c_string_to_jsval
|
2017-08-18 14:55:08 +08:00 |
|
James Chen
|
e58401f0fa
|
updates template
|
2017-08-18 14:44:44 +08:00 |
|
James Chen
|
717face5fb
|
Updates xcode project
|
2017-08-18 14:39:07 +08:00 |
|
James Chen
|
7c889aa691
|
updates SDKManager
|
2017-08-18 14:34:55 +08:00 |
|
James Chen
|
ce7c78a857
|
updates external and bindings-generator.
|
2017-08-18 14:34:55 +08:00 |
|
James Chen
|
2fab54c612
|
fix ios crash after closing app in task manager.
|
2017-08-18 14:34:55 +08:00 |
|
James Chen
|
b2ff785501
|
updates bindings-generator.
|
2017-08-18 14:34:55 +08:00 |
|
James Chen
|
73e45e92e4
|
Adds MappingUtils file, box2d works again.
|
2017-08-18 14:34:55 +08:00 |
|
pandamicro
|
6ed7b716d8
|
Merge pull request #762 from pandamicro/v1.6
Fix iOS closing app crash
|
2017-08-18 14:22:37 +08:00 |
|
pandamicro
|
b946efe457
|
Fix iOS closing app crash in AnySDK
|
2017-08-18 11:56:12 +08:00 |
|
pandamicro
|
e863e9b7d9
|
Fix iOS closing app crash
|
2017-08-18 11:55:12 +08:00 |
|
Wang Nan
|
53b68656a4
|
Merge pull request #759 from dumganhar/fix/v1.6-ws-crash
Fixes crash while invoking ws.send method after onclose event.
|
2017-08-17 16:07:20 +08:00 |
|
Wang Nan
|
94c78770a1
|
Merge pull request #758 from 2youyou2/v1.6
fixed not copy .so files when first build android-studio project
|
2017-08-17 16:06:14 +08:00 |
|
Wang Nan
|
d850a3125d
|
Merge pull request #757 from CocosRobot/update_js_bindings_1502876175
[ci skip][AUTO]: updating jsbinding automatically
|
2017-08-17 16:04:53 +08:00 |
|
pandamicro
|
2d7bef7ff6
|
More secured check in isObjectValid
|
2017-08-17 14:17:32 +08:00 |
|
pandamicro
|
701b45f476
|
Merge pull request #760 from pandamicro/v1.6
Fix isObjectValid for null or undefined parameter
|
2017-08-17 10:03:01 +08:00 |
|
pandamicro
|
8b6c26a84a
|
Fix isObjectValid for null or undefined parameter
|
2017-08-17 10:00:54 +08:00 |
|
pandamicro
|
f05ada4a44
|
Add necessary error report
|
2017-08-17 10:00:33 +08:00 |
|
James Chen
|
fcfbd6e4fa
|
Fixes crash while invoking ws.send method after onclose event.
|
2017-08-16 17:58:40 +08:00 |
|
2youyouo2
|
57ec3bbf61
|
Merge branch 'v1.6' of github.com:cocos-creator/cocos2d-x-lite into v1.6
|
2017-08-16 17:45:47 +08:00 |
|
2youyouo2
|
93862c24fa
|
fixed not copy .so files when first build android-studio project
|
2017-08-16 17:44:18 +08:00 |
|
CocosRobot
|
0491dcd819
|
[ci skip][AUTO]: updating jsbinding automatically
|
2017-08-16 09:37:18 +00: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
|
1a029399f9
|
Adds BaseJSAction and cleanup.
|
2017-08-16 15:42:26 +08:00 |
|
James Chen
|
dbe9716536
|
Adds BaseJSAction
|
2017-08-16 15:41:27 +08:00 |
|
pandamicro
|
39d4d0ad77
|
Merge pull request #752 from dumganhar/fix/v1.6-android-x86-typo
Fixes compilation errors for android x86 audio module and fixes a typo
|
2017-08-16 11:56:17 +08:00 |
|
pandamicro
|
1c0eaf9065
|
Merge pull request #755 from 2youyou2/simulator
support debug windows simulator
|
2017-08-16 11:55:29 +08:00 |
|
pandamicro
|
7ad8f8b25d
|
Merge pull request #754 from 2youyou2/v1.6
fixed graphics crash
|
2017-08-16 11:55:14 +08:00 |
|
James Chen
|
4b4789f9c3
|
Updates config.json
|
2017-08-16 11:26:42 +08:00 |
|
James Chen
|
f9911434e2
|
Updates template's AppDelegate.cpp
|
2017-08-16 11:18:05 +08:00 |
|
2youyou2
|
40812d7000
|
support debug windows simulator
|
2017-08-15 17:54:03 +08:00 |
|
2youyou2
|
fee0b3d4d8
|
replace tab to 4 spaces
|
2017-08-15 11:46:50 +08:00 |
|
2youyou2
|
5d3268f0a7
|
fixed graphics crash
|
2017-08-15 11:43:36 +08:00 |
|
James Chen
|
3e145b7d2a
|
Sync PR: https://github.com/cocos-creator/cocos2d-x-lite/pull/730
|
2017-08-14 16:46:38 +08:00 |
|