James Chen
09e55152ec
Adds JSB2.0 English documentation. ( #999 )
2017-11-20 16:30:13 +08:00
James Chen
0a10b3b7f8
Fixes ccvalue_to_seval convertion function didn't consider some kinds of types. ( #996 )
2017-11-17 17:30:25 +08:00
James Chen
9762662d30
Updates docs for debugging. ( #995 )
2017-11-17 15:22:58 +08:00
James Chen
38c666acc2
Returns true if passing null or undefined value to seval_to_native_ptr and sets the out value to nullptr. ( #994 )
2017-11-17 15:07:44 +08:00
pandamicro
ad3b3599ab
Merge pull request #993 from dumganhar/v1.7
...
Any kinds of se::Value should be able to be converted to std::string.
2017-11-17 14:13:45 +08:00
James Chen
69ee2e12bb
Reverts localStorage changes in PR #545 since any js value could be converted to string.
...
Keeps the behavior the same as web browser.
2017-11-17 13:57:30 +08:00
James Chen
5050fb570b
Any kinds of se::Value should be able to be converted to std::string.
2017-11-17 13:52:43 +08:00
James Chen
4ccf1df75a
Adds se::Object::toString() method for converting an Object to std::string. ( #992 )
2017-11-17 13:40:25 +08:00
James Chen
f8b9f8134c
bug fixs from #959 but except changes in CCSpriteBatchNode.cpp. ( #991 )
...
* bug fixs
* Reverts changes in CCSpriteBatchNode.cpp
2017-11-16 14:00:11 +08:00
James Chen
de091e7369
se::Object::getTypedArrayData fix for jsc and v8. Need to consider byteOffset of ArrayBuffer stored in TypedArray. ( #989 )
2017-11-16 10:39:33 +08:00
James Chen
bb85aeba13
Don't be so strict of checking whether it's in garbage collecting in releaseScriptObject. ( #988 )
2017-11-15 16:43:03 +08:00
James Chen
2acd8b555a
Adds assertion while uses a wrong debug address or port in DEBUG mode. ( #986 )
2017-11-15 14:23:28 +08:00
CocosRobot
2c162cb6b4
[AUTO][ci skip]: updating cocos2dx_files.json ( #985 )
2017-11-14 18:34:20 +08:00
James Chen
4a61e1423f
Re-binds OpenGL interfaces. ( #976 )
...
* Adds opengl bindings code.
* Register OPENGL module.
* Updates Android.mk
* Updates win32 project configuration.
* Supports boolean -> integer conversion.
* glXXXXv count fix.
* GLNode needs to inherit from Node.
* Updates bindings.
* size fix in JSB_glGetUniformfv.
* JSB_glGetSupportedExtensions fix.
2017-11-14 18:05:14 +08:00
James Chen
0fccb356ae
Merge pull request #984 from cocos-creator/v1.7-release
...
Merge v1.7-release
2017-11-14 15:13:24 +08:00
James Chen
66bc0e63a3
Uses toStringForce for location name since it's probably be undefined in v8. ( #983 )
...
And other minor fixes for sm and chakracore.
2017-11-14 14:58:44 +08:00
James Chen
94840bb5c2
Fixes potential crash in eventDispatcher.removeListener(listener). ( #982 )
...
It may invoke `releaseListener` two times if it's dispatching event. `releaseListener` will call releaseScriptObject internally which may cause the `listener` being garbage collected.
It's hard to reproduce this issue in v1.6 since v1.6 uses SpiderMonkey as its JS engine which is not sensitive to do a GC operation.
2017-11-14 14:50:05 +08:00
Jare Guo
2a8702af7c
Merge pull request #981 from cocos-creator/v1.7-release
...
Update V1.7
2017-11-13 02:50:04 -06:00
James Chen
d2462a8c7f
Fixes apple reject apps reference JSSynchronousGarbageCollectForDebugging ( #980 )
2017-11-12 09:18:07 +08:00
James Chen
d904232f95
Uses shorter module name (cocos2dx_internal_static -> cis) to avoid compilation errors on Windows system which has a limitation of 260 bytes for build path. ( #979 )
...
Yep, probably, we could define `buildDir` variable in build.gradle, but let's investigate later.
2017-11-12 09:16:54 +08:00
James Chen
3617745392
Fixes xhr.send(undefined) or xhr.send(null) will not send any request to server. ( #977 )
2017-11-10 16:17:36 +08:00
James Chen
bb21caf9f9
CCLOG -> CCLOGINFO for spTrackEntry relevant logs. ( #978 )
...
fixed https://github.com/cocos-creator/fireball/issues/6611
2017-11-10 16:11:12 +08:00
yinkaile
decf8f0b99
fixed windows binary template ( #975 )
2017-11-09 17:37:19 +08:00
James Chen
a55cb9b0d3
Adds New API se::Object::createTypedArray and deprecates se::Object::createUint8TypedArray. ( #974 )
...
* Adds New API se::Object::createTypedArray and deprecates se::Object::createUint8TypedArray.
* Fixes mistake while cherry-pick.
2017-11-09 17:06:13 +08:00
James Chen
53921c2420
Merge pull request #973 from cocos-creator/v1.7-release
...
Merge v1.7-release
2017-11-09 16:34:55 +08:00
Jare Guo
13ca7022df
Merge pull request #972 from jareguo/v1.7-release
...
update gulpfile
2017-11-07 04:59:41 -06:00
Jare Guo
8f784a2b14
update gulpfile
2017-11-07 18:36:34 +08:00
James Chen
2cc7cc3123
Merge pull request #971 from dumganhar/v1.7-release
...
Updates libcocosanalytics.jar and updates template permissions.
2017-11-07 17:11:12 +08:00
James Chen
e5e616b794
Updates console.
2017-11-07 17:05:49 +08:00
James Chen
75fd551a3c
Merge pull request #966 from 2youyou2/camera
...
add setEnable to CameraNode
2017-11-07 16:12:30 +08:00
James Chen
7739e2c47d
Updates template AndroidManifest.xml.
2017-11-07 16:05:44 +08:00
James Chen
2b463b2b84
Updates libcocosanalytics.jar
2017-11-07 16:05:22 +08:00
James Chen
15d92aa24f
Updates config.json
2017-11-07 16:04:20 +08:00
James Chen
96590e45f6
Merge pull request #970 from dumganhar/v1.7-release
...
Sync PR: fix CCTextureCache addImageAsync race condition
2017-11-07 15:54:13 +08:00
James Chen
e90d906ba3
Sync PR: fix CCTextureCache addImageAsync race condition
...
https://github.com/cocos2d/cocos2d-x/pull/18366
2017-11-07 15:48:56 +08:00
James Chen
cff0be15f7
Merge pull request #969 from CocosRobot/update_cocosfiles_1510035853
...
[AUTO][ci skip]: updating cocos2dx_files.json
2017-11-07 14:26:09 +08:00
CocosRobot
4467d995f4
[AUTO][ci skip]: updating cocos2dx_files.json
2017-11-07 06:24:13 +00:00
James Chen
0ee462fa9c
Merge pull request #968 from dumganhar/v1.7-release
...
Fixes build branch
2017-11-07 14:19:13 +08:00
James Chen
ed62ffc180
Merge pull request #967 from dumganhar/v1.7
...
Fixes build branch
2017-11-07 14:18:49 +08:00
James Chen
3b737f735e
Fixes build branch
2017-11-07 14:16:40 +08:00
James Chen
ad879e7a21
Fixes build branch
2017-11-07 14:15:50 +08:00
James Chen
2dba22d7b6
Merge pull request #965 from CocosRobot/update_cocosfiles_1510020395
...
[AUTO][ci skip]: updating cocos2dx_files.json
2017-11-07 14:05:58 +08:00
yinkaile
3497f34b3d
add setEnable to CameraNode
2017-11-07 11:17:27 +08:00
CocosRobot
d407731be8
[AUTO][ci skip]: updating cocos2dx_files.json
2017-11-07 02:06:35 +00:00
James Chen
018b29e6ce
Merge pull request #964 from cocos-creator/v1.7-release
...
Merge v1.7-release
2017-11-07 10:01:49 +08:00
Jare Guo
befa4bf4f3
Merge pull request #962 from jareguo/v1.7-release
...
gulpfile: refine gen-simulator
2017-11-06 17:31:30 +08:00
James Chen
d898d23a40
Merge pull request #963 from dumganhar/fix/gen-libs-android
...
Updates console
2017-11-06 17:17:56 +08:00
James Chen
d7c619ff77
Updates console
2017-11-06 17:15:50 +08:00
Jare Guo
185b88442f
Merge commit '3c525f2a5fc3ba560b2ce908b4d8be2f94c0691e' into v1.7-release
...
# Conflicts:
# tools/simulator/frameworks/runtime-src/proj.android-studio/app/build.gradle
# tools/simulator/frameworks/runtime-src/proj.android-studio/build.gradle
# tools/simulator/frameworks/runtime-src/proj.android-studio/gradle.properties
2017-11-06 16:57:14 +08:00
Jare Guo
3c525f2a5f
Merge pull request #961 from dumganhar/fix/gen-libs-android
...
Updates simulator configuration for android.
2017-11-06 16:51:24 +08:00