CocosRobot
|
68c8e98753
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2017-10-19 02:05:22 +00:00 |
|
Wang Nan
|
51c8d2ebd9
|
Merge pull request #909 from dumganhar/jsb2.0
Supports cocos analytics for Android. iOS support is on the road.
|
2017-10-18 21:00:39 -05:00 |
|
James Chen
|
f46cb75958
|
Merge pull request #907 from 2youyou2/native-modules
support native modules
|
2017-10-19 09:51:40 +08:00 |
|
knoxHuang
|
2027d2f752
|
fix fireball/issues/6475
|
2017-10-18 17:13:54 +08:00 |
|
James Chen
|
1265b26bba
|
Supports cocos analytics for Android. iOS support is on the road.
|
2017-10-18 16:48:50 +08:00 |
|
James Chen
|
1890949d86
|
[android] JavascriptJavaBridge supports signature of Long type.
And uses enum class for ValueType.
|
2017-10-18 16:46:56 +08:00 |
|
yinkaile
|
72663e21f8
|
Merge branch 'native-modules' of github.com:2youyouo2/cocos2d-x-lite into native-modules
|
2017-10-18 11:30:21 +08:00 |
|
yinkaile
|
c9dabff513
|
fixed ios project
|
2017-10-18 11:29:50 +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 |
|
James Chen
|
b3a09b7be4
|
Merge pull request #906 from dumganhar/jsb2.0
Improves native window.console support. Message could be shown both in Browser while debugging and Creator's console.
|
2017-10-17 16:03:59 +08:00 |
|
James Chen
|
f63aa25170
|
Fixes console.assert
|
2017-10-17 15:44:49 +08:00 |
|
James Chen
|
fa4805203d
|
Fixes a typo in docs.
|
2017-10-17 15:41:16 +08:00 |
|
James Chen
|
c195c82c2f
|
Improves native window.console support. Message could be shown both in Browser while debugging and Creator's console.
The line number of console.log(debug,info,warn,error) output in browser is precise.
|
2017-10-17 15:41:00 +08:00 |
|
CocosRobot
|
92abdad8ac
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2017-10-17 06:05:06 +00:00 |
|
Wang Nan
|
61d141629e
|
Merge pull request #904 from 2youyou2/v1.6
add missed anysdk file
|
2017-10-17 00:59:48 -05:00 |
|
yinkaile
|
5ee73c6864
|
fixed simulator project
|
2017-10-17 12:08:37 +08:00 |
|
yinkaile
|
578f44248e
|
add USE_NET_WORK macro
|
2017-10-16 17:08:09 +08:00 |
|
yinkaile
|
6bc3fa1464
|
add missed anysdk file
|
2017-10-16 16:31:56 +08:00 |
|
yinkaile
|
5629e26e58
|
Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into native-modules
# Conflicts:
# cocos/scripting/js-bindings/manual/jsb_creator_manual.cpp
|
2017-10-16 15:53:44 +08:00 |
|
James Chen
|
96709d7609
|
Fixes wrong usage of assert macro in jsb_creator_manual.cpp.
|
2017-10-13 17:45:08 +08:00 |
|
James Chen
|
3ca18ae61a
|
Updates version to 1.7.0 in package.json.
|
2017-10-13 15:23:35 +08:00 |
|
James Chen
|
03057774cd
|
Updates docs for Ref class binding.
|
2017-10-13 14:55:51 +08:00 |
|
James Chen
|
a301199621
|
EventAssetsManagerEx needs to be allocated on heap since it's the subclass of cocos2d::Ref.
|
2017-10-13 13:39:18 +08:00 |
|
James Chen
|
b2409b424e
|
fixed #897: Node::setGLProgramState needs to retain / release js script object.
|
2017-10-13 09:51:46 +08:00 |
|
yinkaile
|
8ac7257a46
|
fixed merge errors
|
2017-10-12 18:15:21 +08:00 |
|
yinkaile
|
f7b2b1f87f
|
Merge branch 'develop' into native-modules
# Conflicts:
# cocos/scripting/js-bindings/auto/jsb_creator_auto.cpp
# cocos/scripting/js-bindings/manual/jsb_creator_physics_manual.cpp
|
2017-10-12 17:48:16 +08:00 |
|
yinkaile
|
d38e168441
|
support native modules
|
2017-10-12 17:35:08 +08:00 |
|
James Chen
|
b9b9a88354
|
Don't crash if jsb.reflection.callStaticMethod invokes a nonexistent Java Class.
|
2017-10-12 15:31:24 +08:00 |
|
James Chen
|
ae8dc9ce35
|
Safer code in Cocos2dxHttpURLConnection.java
|
2017-10-12 15:05:52 +08:00 |
|
James Chen
|
2a9f8441fb
|
Less asserts and more precondtions in jsb_xmlhttprequest.cpp.
|
2017-10-12 13:59:26 +08:00 |
|
James Chen
|
26375fcddc
|
Updates docs for conversion functions.
|
2017-10-12 11:42:01 +08:00 |
|
James Chen
|
c821a5cc90
|
More safe checks in jsb_websockets.cpp
|
2017-10-12 11:17:48 +08:00 |
|
James Chen
|
50c36d32f5
|
Same behavior of cc.sys.localStorage.getItem(null) as bowser, it should return null instead of undefined.
|
2017-10-12 11:16:53 +08:00 |
|
James Chen
|
d7c0982463
|
Merge pull request #884 from jareguo/develop
support load spine atlas from preloaded texture on JSB
|
2017-10-12 11:15:55 +08:00 |
|
Jare Guo
|
377881d4d3
|
update atlas getter
|
2017-10-12 10:05:46 +08:00 |
|
James Chen
|
f7bd0dd738
|
Updates version to 1.7.0
|
2017-10-11 22:09:52 +08:00 |
|
James Chen
|
ee9713e007
|
CCLOG -> CCLOGINFO in finalize callback for less log output.
|
2017-10-11 17:02:46 +08:00 |
|
James Chen
|
f91a758fb8
|
Merge pull request #891 from dumganhar/jsb2.0
Comments code of listening EVENT_RESET in WebSocket-libwebsockets.cpp since it isn't needed for JSB.
|
2017-10-11 16:36:07 +08:00 |
|
James Chen
|
08b38745a0
|
. -> ,
|
2017-10-11 16:35:18 +08:00 |
|
James Chen
|
1764e440cd
|
Comments code of listening EVENT_RESET in WebSocket-libwebsockets.cpp since it isn't needed for JSB.
Minior fix: CCLOG -> LOGD in jsb_xmlhttprequest.cpp.
|
2017-10-11 16:33:02 +08:00 |
|
Jare Guo
|
6914b57c22
|
Merge commit 'aade73a2f487510ff2f6138e8336d1f76b264ab7' into develop
|
2017-10-11 14:48:16 +08:00 |
|
James Chen
|
aade73a2f4
|
Merge pull request #890 from dumganhar/jsb2.0
Adds seval_to_Map_string_key convertion function.
|
2017-10-11 14:46:48 +08:00 |
|
James Chen
|
c146c9c0c7
|
Adds seval_to_Map_string_key convertion function.
|
2017-10-11 14:45:39 +08:00 |
|
James Chen
|
9714f1c412
|
Merge pull request #889 from dumganhar/jsb2.0
Removes COCOS2D_DEBUG definition in release mode. Adds APP_CFLAGS.
|
2017-10-11 14:13:49 +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 |
|
Wang Nan
|
7babdd652b
|
add comment
|
2017-10-11 13:53:42 +08:00 |
|
James Chen
|
331eb55a18
|
Updates config.json and adds error check for no script engine selected.
|
2017-10-11 12:44:42 +08:00 |
|
James Chen
|
dbe0db18a3
|
Merge pull request #887 from dumganhar/jsb2.0
jsb_enable_debugger() uses local IP "0, 0, 0, 0", then Android debugging doesn't need to change IP.
|
2017-10-11 12:33:18 +08:00 |
|