Commit Graph

29453 Commits

Author SHA1 Message Date
minggo 95bb2b7b7b Merge pull request #10392 from super626/v3_render
fix render state
2015-02-06 16:02:16 +08:00
yangxiao 2ac0b35283 fix render state 2015-02-06 10:09:23 +08:00
Nite Luo ee2781e6a6 Merge pull request #10223 from vovkasm/cmake-msvc-fixes-core
Cmake build system fixes for MSVC (partial)
2015-02-04 23:18:08 -08:00
Jacky ecefc53c0d fixed Camera3dTest restart bug. 2015-02-05 14:16:31 +08:00
lvlong 6152925739 If parse the vertex attribute is fail, then discard the vertex attribute. 2015-02-04 16:19:30 +08:00
flamefox ac37ed3a4c revert this file 2015-02-04 10:37:32 +08:00
flamefox 4b405db77d fix tab to space 2015-02-04 10:36:16 +08:00
flamefox 3737a45052 Merge branch '3dattachnode' of https://github.com/flamefox/cocos2d-x into 3dattachnode 2015-02-04 10:34:03 +08:00
flamefox c2e17d6b1d getAttachNode should failed when there is no bone with name 2015-02-04 10:32:44 +08:00
flamefox 25d7dc9dfb getAttachNode should failed when there is no bone with name 2015-02-04 10:24:29 +08:00
XiaoYang c9fe5251a9 Merge pull request #229 from lvlonggame/v3
add Camera::project
2015-02-04 09:38:31 +08:00
yangxiao 19edeb971b fix warning 2015-02-03 17:51:16 +08:00
yangxiao 3b4f35decd Merge branch 'terrain' of https://github.com/super626/cocos2d-x into terrain 2015-02-03 17:39:02 +08:00
yangxiao 66da4e8096 mac work 2015-02-03 17:38:40 +08:00
XiaoYang e66414f82f Merge pull request #230 from tangziwen/terrain_tzw
set appropriate LOD distance value
2015-02-03 17:38:21 +08:00
tangziwen ca018f9ff2 set appropriate LOD distance value 2015-02-03 17:35:52 +08:00
XiaoYang 6ba0e82e55 Merge pull request #221 from tangziwen/terrain_tzw
Terrain tzw
2015-02-03 16:19:58 +08:00
byeonggee.seo 753335726a receive content data even though status code is not 2xx 2015-02-03 16:28:23 +09:00
lvlong a0c7723edb add GP_ASSERT 2015-02-03 14:21:12 +08:00
flamefox cc14ee3121 Merge branch 'v3' of https://github.com/flamefox/cocos2d-x into v3 2015-02-03 13:51:26 +08:00
flamefox 558d467109 Merge pull request #3 from cocos2d/v3
V3
2015-02-03 13:49:54 +08:00
flamefox c195e1f88a Merge branch 'v3' of https://github.com/flamefox/cocos2d-x into v3 2015-02-03 13:49:40 +08:00
lvlong 6d92b7adc9 modify Camera::project 2015-02-03 11:59:43 +08:00
Nite Luo 6f53719772 Merge pull request #10317 from darkdukey/G17hao-patch-12
Improve group command
2015-02-02 14:12:50 -08:00
yangxiao 265e6fec1a fix index 2015-02-02 16:54:55 +08:00
tangziwen b0f7c232e2 fix test 2015-02-02 16:14:13 +08:00
yangxiao f608377bdb make vao work 2015-02-02 15:44:47 +08:00
byeonggee.seo 23e0320cac HttpResponse reference counting bug fixed 2015-02-02 12:23:15 +09:00
XiaoYang 76eb66e107 Merge pull request #227 from IPubby/texturecube_simipfy
Texturecube simipfy
2015-02-02 09:46:59 +08:00
lvlonggame 23df00b0b9 Merge branch 'v3' of github.com:lvlonggame/cocos2d-x into v3 2015-02-01 21:17:12 +08:00
lvlonggame 4c65332550 add project function to camera 2015-02-01 21:14:37 +08:00
Huabing.Xu 173578cf41 Merge pull request #10315 from samuele3hu/v3_4_rc1
Fix the error that the binary data would be truncated
2015-02-01 07:18:31 +08:00
Nite Luo e9b4e4e19c Merge branch 'patch-13' of https://github.com/G17hao/cocos2d-x into G17hao-patch-12 2015-01-31 09:46:59 -08:00
Nite Luo 07cda0db37 Merge branch 'patch-12' of https://github.com/G17hao/cocos2d-x into G17hao-patch-12 2015-01-31 09:46:31 -08:00
samuele3hu fec0d9c41d Set default value for `Content-Type` of headfield in `PUT` method 2015-01-31 22:15:15 +08:00
samuele3hu 75dc45bfea Remove useless blank line 2015-01-31 15:21:03 +08:00
samuele3hu e6d50d7086 Fix the error that the binary data would be truncated 2015-01-31 14:31:24 +08:00
Vladimir Perminov bb2d2c9a07 Fix visual studio project out of date
Remove 3dExport.h from project.
Change location CCPlatformConfig.h and CCPlatformMacros.h from ..\base\
to ..\platform\
2015-01-30 17:37:19 +03:00
minggo a1c8c615ac Merge pull request #10308 from minggo/v3
[ci skip]update console submodule
2015-01-30 20:13:04 +08:00
minggo 49489ba3ad update console 2015-01-30 20:06:43 +08:00
zhukaixy 806a5011e5 solve the problems noted in comments 2015-01-30 17:23:30 +08:00
pandamicro 083942174d Fix ListView::setDirection issue 2015-01-30 17:02:20 +08:00
tangziwen 10eced8b98 bug fix upload new sample texture 2015-01-30 15:46:39 +08:00
minggo f4266c9ae3 update console submodule 2015-01-30 14:58:20 +08:00
Huabing.Xu 8abc09f5ee Merge pull request #10295 from dabingnn/v3_updateReleaseNotes
[ci skip] update releasenotes
2015-01-30 14:26:53 +08:00
Huabing.Xu 7b5b1557ff [ci skip] update releasenotes 2015-01-30 14:25:26 +08:00
minggo 1fa09a3af8 [ci skip]update CHANGELOG 2015-01-30 11:27:08 +08:00
minggo 9b83bdcee6 Merge pull request #10287 from pandamicro/v3_origin
cocos2d/cocos2d-js#1313: Remove dangerous code in AssetsManagerEx::setStoragePath
2015-01-30 11:23:10 +08:00
flamefox deb5fd46ff add dos2unix.exe to templates\cocos2dx_files.json 2015-01-30 11:14:51 +08:00
pandamicro 897416eb4e cocos2d/cocos2d-js#1313: Remove dangerous code in AssetsManagerEx::setStoragePath 2015-01-30 11:12:35 +08:00