Commit Graph

27460 Commits

Author SHA1 Message Date
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
Huabing.Xu b92802a770 optimise Renderer::fillQuads() 2014-12-30 15:07:50 +08:00
Huabing.Xu 6576c16fe1 optimise QuadCommand::init() 2014-12-30 14:21:33 +08:00
minggo 538be7d973 Merge pull request #9693 from doomsdayer/v3_version
Feature of version check.
2014-12-30 13:56:16 +08:00
minggo 69636dc8f5 Merge pull request #9698 from CocosRobot/update_lua_bindings_1419911433
[AUTO]: updating luabinding automatically
2014-12-30 13:51:43 +08:00
minggo ba4ae50868 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into use-const 2014-12-30 13:36:10 +08:00
minggo da8c007932 add const for Sprite::getTextureRect() and do some format 2014-12-30 11:55:54 +08:00
yangxiao 3377c3ee53 fix #9689 2014-12-30 11:54:53 +08:00
CocosRobot ed7823c08b [AUTO]: updating luabinding automatically 2014-12-30 03:52:26 +00:00
yangxiao bfb577e385 fix ##9689 2014-12-30 11:48:39 +08:00
minggo c78bf0f7aa Merge pull request #9668 from pandamicro/v3_origin
Added restart game feature and getSearchPaths API in Manifest
2014-12-30 11:47:51 +08:00
Huabing.Xu 485c72651d exextract updateUniformsAndAttributes 2014-12-30 11:13:14 +08:00
yusheng.lu 9a0f302370 revert the layoutComponent codes to prevent the demos crush. 2014-12-30 10:47:00 +08:00
yusheng.lu e5961047aa Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_version
Conflicts:
	cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp
2014-12-30 10:42:54 +08:00
yusheng.lu 88f0a1e642 prevent the crush of the cocosstudio demos 2014-12-30 10:33:07 +08:00
pandamicro 5755cc69e9 Fix a small compilation issue 2014-12-30 10:11:30 +08:00