Commit Graph

26472 Commits

Author SHA1 Message Date
Dale Stammen df64718ef1 removed 3dExport.h as it no longer exists 2014-12-30 20:51:54 -08:00
CocosRobot 1f8bb3f808 [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-31 04:51:26 +00:00
minggo fde63be06a Merge pull request #9725 from huangshiwu/iosnetwork
iOS HttpClient replace libcurl
2014-12-31 12:50:11 +08:00
minggo ee5b24e001 Merge pull request #9732 from super626/v3
Read version 0.6
2014-12-31 12:47:38 +08:00
samuele3hu 3795f9cc2a Rename HttpClient-android.cpp and unify java indent format 2014-12-31 12:03:27 +08:00
andyque ddb6e678a6 update config.json 2014-12-31 11:58:54 +08:00
yangxiao d23eb83ba1 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-12-31 11:40:37 +08:00
huangshiwu 893aded9b7 iOS HttpClient replace libcurl - fix Jenkins compile error 2014-12-31 11:32:35 +08:00
Huabing.Xu 4e70f44989 Merge pull request #9726 from dabingnn/v3_updateChangelog
[ci skip] update changeLog
2014-12-31 10:35:44 +08:00
Huabing.Xu a9cc40cc6a [ci skip] update changeLog 2014-12-31 10:34:42 +08:00
andyque 489219ff5e add prebuilt libcurl to linux 2014-12-31 10:19:03 +08:00
andyque 7a8634ff0e remove libcurl.dylib 2014-12-31 10:18:44 +08:00
andyque 5caccfd053 upgrade libcurl mac project settings 2014-12-31 10:18:44 +08:00
andyque 60ec08eef4 upgrade libcurl for iOS 2014-12-31 10:18:44 +08:00
samuele3hu f7ed73c1e1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_4_httpclient 2014-12-31 10:17:12 +08:00
samuele3hu 0e94bdda3a Use android network module — HttpURLConnection to replace the libcurl on the android platform 2014-12-31 10:15:14 +08:00
minggo 51c89c3a22 Merge pull request #9720 from dabingnn/v3_perf
V3 perf
2014-12-31 10:02:59 +08:00
minggo 395d51c1f3 Merge pull request #9723 from CocosRobot/update_cocosfiles_1419991185
[AUTO][ci skip]: updating cocos2dx_files.json
2014-12-31 10:02:21 +08:00
huangshiwu 7426b5c4b5 iOS HttpClient replace libcurl 2014-12-31 10:02:14 +08:00
minggo 274d7d2276 Merge pull request #9718 from darkdukey/depthWriteFix
Disable write to depth buffer for transparent objects
2014-12-31 10:00:48 +08:00
CocosRobot a3e15a3d29 [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-31 01:59:46 +00:00
minggo 0d23e5906d Merge pull request #9717 from geron-cn/armaturenodefix
make current animation name take effect when autoplay is false
2014-12-31 09:58:35 +08:00
minggo 5d109d0415 Merge pull request #9721 from MSOpenTech/wp8-fix
WP8 and Windows 8.1 Universal App fixes
2014-12-31 09:47:58 +08:00
minggo a281634c1e Merge pull request #9711 from dabingnn/v3_addUpdateUniformsAndAttributes
V3 add update uniforms and attributes
2014-12-31 09:45:08 +08:00
Dale Stammen f73a07c7b9 added missing files 2014-12-30 17:27:37 -08:00
Dale Stammen bd1fef7515 added missing files 2014-12-30 16:40:04 -08:00
Dale Stammen 57f0ef41b4 added missing inet_pton() for windows phone 2014-12-30 16:39:26 -08:00
Dale Stammen d33fad0ac7 fixed check for header already included 2014-12-30 16:39:02 -08:00
Dale Stammen f4cd2e311d added missing inet_pton() for windows phone 2014-12-30 16:38:18 -08:00
Nite Luo a68dfa13ec Disable Depth Write for transparent objects 2014-12-30 13:35:29 -08:00
geron-cn 89c39d3f10 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into armaturenodefix 2014-12-31 04:06:11 +08:00
geron-cn b048b65ae3 make current animation name take effect when autoplay is false 2014-12-31 03:59:36 +08:00
minggo bc77d87a8e Merge pull request #9712 from CocosRobot/update_cocosfiles_1419935693
[AUTO][ci skip]: updating cocos2dx_files.json
2014-12-30 18:36:32 +08:00
CocosRobot cb7a63b413 [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-30 10:34:54 +00:00
minggo c6077bd6fc Merge pull request #9707 from yinjimmy/bugfix_runtime
Bugfix runtime
2014-12-30 18:32:38 +08:00
minggo 70a29a8470 Merge pull request #9709 from htlxyz/v3_origin
modify widget interface for lua
2014-12-30 18:32:20 +08:00
Huabing.Xu c60c3fb2b1 refresh uniforms and attributes when access uniform or attribute table 2014-12-30 18:32:09 +08:00
minggo d517831e01 Merge pull request #9699 from super626/fixandroid
fix background/foreground switch
2014-12-30 17:07:38 +08:00
htl dce4383357 modify widget interface for lua 2014-12-30 16:45:26 +08:00
minggo d0e003836f Merge pull request #9705 from CocosRobot/update_lua_bindings_1419928121
[AUTO]: updating luabinding automatically
2014-12-30 16:43:55 +08:00
minggo 4463403be4 Merge pull request #9706 from natural-law/v3
Update the reference of submodule cocos2d-console.
2014-12-30 16:41:19 +08:00
CocosRobot f4fbf51905 [AUTO]: updating luabinding automatically 2014-12-30 08:30:45 +00:00
zhangbin 98e24b1cdc Update the reference of submodule cocos2d-console. 2014-12-30 16:28:23 +08:00
minggo ef95b1d52d Merge pull request #9700 from minggo/use-const
fix some coding style
2014-12-30 16:24:41 +08:00
minggo 816f5d1144 Merge pull request #9703 from CocosRobot/update_lua_bindings_1419925623
[AUTO]: updating luabinding automatically
2014-12-30 16:06:36 +08:00
yinjimmy 2652a67040 cleanup 2014-12-30 16:02:05 +08:00
yinjimmy d986c974d7 compatible code 2014-12-30 16:01:47 +08:00
yinjimmy 4c57a29455 fix: init config on all platform & stop runtime when exit 2014-12-30 15:59:52 +08:00
CocosRobot 5b8492770e [AUTO]: updating luabinding automatically 2014-12-30 07:49:45 +00:00
minggo 869a9bb0a9 Merge pull request #9652 from lite3/patch-2
fix incorrect font path
2014-12-30 15:43:31 +08:00