子龙山人
|
ef6ed4936e
|
Merge pull request #12211 from CocosRobot/update_lua_bindings_1433491589
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-05 16:16:33 +08:00 |
CocosRobot
|
9178eeca73
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-05 08:11:21 +00:00 |
pandamicro
|
399ecfcb9f
|
Merge pull request #12176 from super626/fixphysics3d
rename syncToNode and syncToPhysics
|
2015-06-05 16:02:45 +08:00 |
子龙山人
|
c5c96042ef
|
Merge pull request #12181 from namezero111111/patch-5
TintBy::clone() incorrect cast
|
2015-06-05 15:27:43 +08:00 |
pandamicro
|
fa71a6e352
|
Merge pull request #12204 from jianglong0156/issue1756
default support curl gzip. and add the gzip test in xmlhttprequest Issue1756
|
2015-06-05 13:17:53 +08:00 |
jianglong0156
|
8d011fd457
|
formate the space
|
2015-06-05 11:45:05 +08:00 |
jianglong0156
|
33beab2d81
|
add gzip test
|
2015-06-05 11:40:29 +08:00 |
pandamicro
|
3ee58091df
|
Merge pull request #12201 from samuele3hu/v3_bug_fix
issue #10257:Fix the error that Draw object display differently on the different platform.
|
2015-06-05 10:47:08 +08:00 |
子龙山人
|
f7e89db0ea
|
Merge pull request #12203 from CocosRobot/update_cocosfiles_1433470389
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-06-05 10:16:41 +08:00 |
CocosRobot
|
297945cca5
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-06-05 02:13:10 +00:00 |
子龙山人
|
1f37869d4e
|
Merge pull request #12193 from andyque/update-3rd-config
upgrade external version to 61
|
2015-06-05 10:11:00 +08:00 |
子龙山人
|
f7fa3ff3f1
|
Merge pull request #12202 from CocosRobot/update_lua_bindings_1433468726
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-05 10:10:41 +08:00 |
CocosRobot
|
9e3fa92803
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-05 01:51:34 +00:00 |
pandamicro
|
2745cd4838
|
Merge pull request #12194 from pandamicro/skipComponentFns
Skip C++ invocation functions of Component
|
2015-06-05 09:41:23 +08:00 |
samuele3hu
|
230899ae32
|
issue #10257:Fix the error that Draw object display differently on the different platform.
|
2015-06-05 09:39:15 +08:00 |
pandamicro
|
e0eff26674
|
Fix component function execution issue in JSB
|
2015-06-05 00:03:21 +08:00 |
pandamicro
|
25e047eb41
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into skipComponentFns
|
2015-06-04 23:29:45 +08:00 |
pandamicro
|
d8f53363f9
|
Merge pull request #12199 from CocosRobot/update_cocosfiles_1433426735
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-06-04 22:08:34 +08:00 |
pandamicro
|
461f2f88f4
|
Merge pull request #12197 from CocosRobot/update_lua_bindings_1433422057
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-04 22:08:03 +08:00 |
CocosRobot
|
1b8ff0e595
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-06-04 14:05:38 +00:00 |
pandamicro
|
6216e74a38
|
Merge pull request #12165 from gyf19/v3
HttpClient Android supports gzip
|
2015-06-04 22:00:13 +08:00 |
CocosRobot
|
8865bd488e
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-04 12:52:41 +00:00 |
pandamicro
|
af756c50dc
|
Merge pull request #12184 from pandamicro/v3
Fix issue that __JSDownloaderDelegator::onError get called twice
|
2015-06-04 20:42:35 +08:00 |
pandamicro
|
e75dee6e7c
|
Remove C++ invocation functions of Component
|
2015-06-04 20:10:10 +08:00 |
pandamicro
|
e473da38cb
|
Skip C++ invocation functions of Component
|
2015-06-04 20:05:30 +08:00 |
andyque
|
2a9984da86
|
upgrade external version to 61
Conflicts:
external/config.json
|
2015-06-04 19:57:01 +08:00 |
pandamicro
|
2db0f94b14
|
Merge pull request #12186 from CocosRobot/update_cocosfiles_1433414963
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-06-04 19:42:01 +08:00 |
pandamicro
|
61e3aecdf4
|
Merge pull request #12190 from cocos2d/revert-12185-update-3rd-libs-version-v3
Revert "update 3rd party libs to 60"
|
2015-06-04 19:39:41 +08:00 |
pandamicro
|
cf431121c9
|
Revert "update 3rd party libs to 60"
|
2015-06-04 19:38:52 +08:00 |
CocosRobot
|
c722dd76d6
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-06-04 10:49:25 +00:00 |
pandamicro
|
e9279a5141
|
Merge pull request #12185 from andyque/update-3rd-libs-version-v3
update 3rd party libs to 60
|
2015-06-04 18:45:01 +08:00 |
pandamicro
|
2da754dcf2
|
Merge pull request #12157 from chengstory/v2_addOnEnterAndOnExitToCCNode
Add onEnter and onExit of components to CCNode's onEnter and onExit function
|
2015-06-04 18:39:52 +08:00 |
andyque
|
77826b453d
|
update 3rd party libs to 60
|
2015-06-04 18:27:03 +08:00 |
pandamicro
|
ed6d6521ac
|
Add CURLOPT_NOSIGNAL to avoid multithread issue on timeout
|
2015-06-04 17:59:56 +08:00 |
pandamicro
|
9576adeafb
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2015-06-04 17:53:00 +08:00 |
pandamicro
|
ba1191f98f
|
Merge pull request #12132 from pandamicro/v3_origin
cocos2d/cocos2d-js#1658: Fix js_load_remote_image issue with multithread
|
2015-06-04 17:51:11 +08:00 |
cheng.zhang
|
28f3d19db8
|
Merge pull request #156 from pandamicro/compJSB
Fix jsbinding calls for CCComponent
|
2015-06-04 17:49:34 +08:00 |
pandamicro
|
6cc0b94404
|
Merge pull request #12180 from natural-law/v3
Update the reference of submodule cocos2d-console.
|
2015-06-04 17:41:36 +08:00 |
Namezero
|
19f95c5542
|
TintBy::clone() incorrect cast
TintBy::clone() incorrectly casts the GLshort members to GLubyte, resulting in an object that isn't a clone and an incorrect tint.
|
2015-06-04 10:13:34 +02:00 |
pandamicro
|
2c168130ed
|
Fix jsbinding calls for CCComponent
|
2015-06-04 15:59:05 +08:00 |
pandamicro
|
86d372222c
|
Merge branch 'v2_addOnEnterAndOnExitToCCNode' of https://github.com/chengstory/cocos2d-x into compJSB
|
2015-06-04 15:54:58 +08:00 |
Bin Zhang
|
825c89299a
|
Update the reference of submodule cocos2d-console.
|
2015-06-04 15:30:45 +08:00 |
pandamicro
|
83f7f30c1c
|
Fix issue that __JSDownloaderDelegator::onError get called twice
|
2015-06-04 15:03:20 +08:00 |
子龙山人
|
5c804922b8
|
Merge pull request #12175 from samuele3hu/v3_bug_fix
issue #10323: Fix the compile error when COCOS2D_DEBUG>=2.
|
2015-06-04 14:59:53 +08:00 |
zhangcheng
|
6a53cfdc76
|
1, modify space format.
|
2015-06-04 14:08:47 +08:00 |
zhangcheng
|
8d3d3a0348
|
1, Add onAdd and onRemove function to replace onEnter and onCancel used in onAdd and onRemove of ComponentContainer.
|
2015-06-04 14:06:31 +08:00 |
pandamicro
|
9c23126d9e
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2015-06-04 13:14:34 +08:00 |
yangxiao
|
73d815b0ab
|
rename syncToNode and syncToPhysics
|
2015-06-04 12:04:41 +08:00 |
samuele3hu
|
fbd5a09cfd
|
issue #10323: Fix the compile error when COCOS2D_DEBUG>=2.
|
2015-06-04 11:58:22 +08:00 |
子龙山人
|
831ca47b13
|
Merge pull request #12158 from WenhaiLin/v3-letter-space
Label:Fixed letter spacing may be wrong.
|
2015-06-04 10:51:25 +08:00 |