tangziwen
|
9ec366a130
|
update terrain test add new method to get normal
|
2015-01-27 15:18:59 +08:00 |
tangziwen
|
d6c3320d49
|
fix memory leak
|
2015-01-23 18:14:44 +08:00 |
tangziwen
|
d04b3feb50
|
add new test, fix memory leak
|
2015-01-23 18:09:54 +08:00 |
tangziwen
|
25cd1f4c02
|
update test
|
2015-01-20 10:34:30 +08:00 |
tangziwen
|
130c18bde0
|
fix LOD indices capacity,refactor the code ,add some comments
|
2015-01-15 15:54:12 +08:00 |
tangziwen
|
804739b38a
|
add cmake
|
2015-01-15 11:45:51 +08:00 |
tangziwen
|
201ae6f321
|
add terrain
|
2015-01-15 11:45:06 +08:00 |
CocosRobot
|
97aee8cef0
|
[AUTO]: updating luabinding automatically
|
2015-01-14 09:19:31 +00:00 |
minggo
|
ec54e042ea
|
Merge pull request #9993 from zawasp/tintto_color3b
add Color3B type parameter to TintTo::create
|
2015-01-14 17:14:58 +08:00 |
minggo
|
825f90564c
|
Merge pull request #9992 from samuele3hu/v3_4_issue9986
issue #9986:Add lua bindings for Component and related test cases
|
2015-01-14 17:05:51 +08:00 |
Mircea Rila
|
2a235f5b8d
|
add Color3B type parameter to TintTo::create
|
2015-01-14 11:04:23 +02:00 |
Wenhai Lin
|
b61adcfdbb
|
Fixed can't get correct position of PhysicsBody after add PhysicsBody to PhysicsWorld in the current frame.
|
2015-01-14 17:01:04 +08:00 |
samuele3hu
|
77912270f9
|
issue #9986:Add lua bindings for Component and related test cases
|
2015-01-14 16:58:35 +08:00 |
CocosRobot
|
e69497c7c0
|
[AUTO]: updating luabinding automatically
|
2015-01-14 08:26:14 +00:00 |
minggo
|
1641c92721
|
Merge pull request #9983 from samuele3hu/v3_4_issue9820
issue #9820:Inconsistent :setBlendFunc(...) function binding for Sprite and LabelBMFont classes
|
2015-01-14 16:11:43 +08:00 |
minggo
|
5154b844bb
|
Merge pull request #9985 from super626/frustum
enable disable culling using macro
|
2015-01-14 16:11:28 +08:00 |
minggo
|
1e2029598d
|
Merge pull request #9936 from Dhilan007/v3-cocosplay
Integrate CocosPlayClient
|
2015-01-14 16:10:20 +08:00 |
WenhaiLin
|
553cf58312
|
Remove FileUtilsAndroid::purgeCachedEntries
|
2015-01-14 16:05:33 +08:00 |
minggo
|
d57ba984be
|
Merge pull request #9979 from geron-cn/inneractionframe
inneractionframe rename variables
|
2015-01-14 15:15:51 +08:00 |
samuele3hu
|
c026aa82f9
|
Add CC_DEPRECATED_ATTRIBUTE flag
|
2015-01-14 15:09:37 +08:00 |
yangxiao
|
42c40d895f
|
enable disable culling using macro
|
2015-01-14 14:41:10 +08:00 |
Huabing.Xu
|
6850c7497b
|
Merge pull request #9981 from huangshiwu/v3_ioshttp
fix HttpAsynConnection method didReciveResponse's process error
|
2015-01-14 14:07:31 +08:00 |
huangshiwu
|
12212dc572
|
fix HttpAsynConnection method didReciveResponse's process error
|
2015-01-14 14:01:58 +08:00 |
samuele3hu
|
951324a230
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_4_issue9820
Conflicts:
cocos/scripting/lua-bindings/manual/3d/lua_cocos2dx_3d_manual.cpp
|
2015-01-14 13:58:12 +08:00 |
samuele3hu
|
1d94ae4302
|
issue #9820:Inconsistent :setBlendFunc(...) function binding for Sprite and LabelBMFont classes
|
2015-01-14 13:51:09 +08:00 |
geron-cn
|
ab2b86b392
|
rename variables
|
2015-01-14 13:02:30 +08:00 |
Huabing.Xu
|
34582ba268
|
Merge branch 'v3' into v3_AddOptionsForCulling
Conflicts:
cocos/2d/CCLabel.cpp
|
2015-01-14 12:44:24 +08:00 |
CocosRobot
|
b134f74db4
|
[AUTO]: updating luabinding automatically
|
2015-01-14 03:43:27 +00:00 |
minggo
|
5459149279
|
Merge pull request #9969 from huangshiwu/pointSize
DrawNode enable draw different size points
|
2015-01-14 11:38:31 +08:00 |
Huabing.Xu
|
610d31d601
|
adjust CC_USE_CULLING macro definition
|
2015-01-14 11:29:02 +08:00 |
huangshiwu
|
9fd000895c
|
modify file copyright information
|
2015-01-14 11:20:33 +08:00 |
minggo
|
d73b5f45ec
|
Merge pull request #9971 from pipu/parse_particlesystemquad
Modify that parses position type of ParticleSystemQuad.
|
2015-01-14 11:09:19 +08:00 |
minggo
|
0207c22cb6
|
Merge pull request #9953 from darkdukey/renderFix
Render fix
|
2015-01-14 11:06:33 +08:00 |
minggo
|
d320941ca1
|
Merge pull request #9963 from Dhilan007/v3-issue9898-fix
Fixed crash if dispatch event after remove event listener in callback
|
2015-01-14 10:59:42 +08:00 |
Huabing.Xu
|
f3d8798d39
|
add macro to enable to disable culling
|
2015-01-14 10:56:51 +08:00 |
pipu
|
e31fe9565a
|
Modify that parses position type of ParticleSystemQuad.
|
2015-01-14 10:24:44 +08:00 |
Nite Luo
|
4335328e3d
|
Add support for creating empty sprite3D
|
2015-01-13 16:41:24 -08:00 |
huangshiwu
|
f4ac7c4e44
|
modify WP8 project and update precompileshader
|
2015-01-14 02:15:04 +08:00 |
huangshiwu
|
fea492ab4f
|
DrawNode enable draw different size points
|
2015-01-13 22:30:50 +08:00 |
WenhaiLin
|
de645a7c9c
|
Fixed crash if dispatch event after remove event listener in callback
|
2015-01-13 18:35:32 +08:00 |
Wenhai Lin
|
58c45ca144
|
Integrate CocosPlayClient
|
2015-01-13 17:30:07 +08:00 |
minggo
|
78e6d2f7ab
|
Merge pull request #9951 from pipu/update_inneractionframe
Update InnerActionFrame
|
2015-01-13 17:10:39 +08:00 |
minggo
|
0709d9f2e9
|
[ci skip]update version
|
2015-01-13 16:35:45 +08:00 |
minggo
|
e9dbe4adc6
|
[ci skip]update version
|
2015-01-13 16:34:59 +08:00 |
Nite Luo
|
45562f3203
|
optimize based on review commends
|
2015-01-12 22:52:20 -08:00 |
minggo
|
bb742c30ad
|
Merge pull request #9950 from dabingnn/v3_perf
cache director pointer to improve rendering performance
|
2015-01-13 14:31:03 +08:00 |
minggo
|
1bb4c12b1d
|
Merge pull request #9948 from samuele3hu/v3_4_fix_bug
issue #9886: fix the number conversion error when passing 0x80000000
|
2015-01-13 14:11:49 +08:00 |
Nite Luo
|
1c10ae43bc
|
Merge branch 'v3' into renderFix
Conflicts:
tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp
tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h
|
2015-01-12 20:43:55 -08:00 |
Nite Luo
|
a84f521e64
|
Clean up the debug functions in Billboard
|
2015-01-12 20:17:00 -08:00 |
Nite Luo
|
8591609128
|
Implement 3D drawing support for Sprite, Label, Particle, BatchNode
|
2015-01-12 20:06:50 -08:00 |