tangziwen
|
4ca6b559e6
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain
|
2015-04-09 09:40:22 +08:00 |
tangziwen
|
2be309d841
|
add reload method in case of GL context Lost.
|
2015-04-08 19:11:46 +08:00 |
yangxiao
|
a7a39d71f5
|
modify getAABBRecursively
|
2015-04-08 16:40:04 +08:00 |
yangxiao
|
0d0bad186f
|
resolve conflict
|
2015-04-08 16:23:35 +08:00 |
tangziwen
|
dc7cd520b2
|
update terrain
|
2015-04-08 15:17:05 +08:00 |
tangziwen
|
3ab4e75a71
|
update
|
2015-04-08 10:10:05 +08:00 |
tangziwen
|
a220a8f669
|
fix wrong attribute location bind, fix memory leak, enable back-face culling
|
2015-04-07 18:47:19 +08:00 |
lvlong
|
c9014e12b4
|
Merge branch 'v3' of github.com:super626/cocos2d-x into v3
Conflicts:
CHANGELOG
|
2015-04-07 16:40:57 +08:00 |
lvlong
|
99ef79f940
|
modify INT_NEAR
|
2015-04-07 16:37:51 +08:00 |
minggo
|
353c2b0d75
|
Merge pull request #11288 from perminovVS/v3-dev-optimize-vec3
Optimize Vec3
|
2015-04-07 14:04:57 +08:00 |
Vladimir Perminov
|
105bac2d55
|
Optimize Vec3
small function Vec3 move to Vec3.inl
Added:
add(float xx, float yy, float zz);
setZero();
Change all code:
_vec3 = Vec3(x, y, z); -> _vec3.set(x, y, z);
Vec3 vec3 = Vec3(x, y, z); -> Vec3 vec3(x, y, z);
_vec3 += Vec3(x, y, z); -> _vec3.add(x, y, z);
_vec3 = Vec3::ZERO; -> _vec3.setZero();
|
2015-04-05 13:09:50 +03:00 |
lvlong
|
4c6eec9ec1
|
add getAABBRecursively
|
2015-04-03 18:04:33 +08:00 |
tangziwen
|
0193420dfc
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain
Resovle Conflicts:
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
|
2015-04-03 15:45:51 +08:00 |
tangziwen
|
8a7b318c1a
|
Add some helper function to detect the heightMap size,refact Terrain::Create, fix typo ,add doxygen comment
|
2015-04-03 13:49:07 +08:00 |
XiaoYang
|
63a27d14b7
|
Merge pull request #282 from lvlonggame/terrain
fix bug: about minFilter and magFilter
|
2015-04-02 17:26:35 +08:00 |
lvlong
|
60bed4f461
|
revert alpha map minFilter
|
2015-04-02 15:10:51 +08:00 |
lvlong
|
c3cc8b917c
|
fix bug: about minFilter and magFilter
|
2015-04-02 15:01:14 +08:00 |
yangxiao
|
1b63e5168a
|
add to linux
|
2015-04-02 14:21:51 +08:00 |
yangxiao
|
9e115073a1
|
fix warning
|
2015-04-02 14:04:31 +08:00 |
XiaoYang
|
984babc9c9
|
Merge pull request #281 from tangziwen/terrain
update terrain
|
2015-04-02 10:19:11 +08:00 |
minggo
|
332ce1a8f3
|
Merge pull request #11249 from super626/v3
Release note for texturecube skybox and animtion quality
|
2015-04-02 09:39:16 +08:00 |
minggo
|
199fb2b694
|
Merge pull request #11250 from super626/texturecube
Texturecube Modify
|
2015-04-02 09:38:26 +08:00 |
lvlong
|
1da7ef121e
|
_aabbDirty = true
|
2015-04-02 09:33:48 +08:00 |
tangziwen
|
6cd1077cb0
|
update terrain
|
2015-04-01 18:24:05 +08:00 |
yangxiao
|
2cc9814702
|
modify
|
2015-04-01 17:58:41 +08:00 |
yangxiao
|
4b7ae430a8
|
Merge branch 'texturecube' of https://github.com/super626/cocos2d-x into texturecube
|
2015-04-01 17:37:55 +08:00 |
yangxiao
|
9540fd590f
|
modify skybox
|
2015-04-01 17:34:57 +08:00 |
yangxiao
|
591fff4046
|
release note for texturecube skybox and animtion quality
|
2015-04-01 16:40:40 +08:00 |
lvlong
|
72722ba5b0
|
fix aabbDirty bug.
|
2015-04-01 10:57:19 +08:00 |
tangziwen
|
3247acc0c1
|
ignore some method ,fix typo
|
2015-04-01 10:23:53 +08:00 |
tangziwen
|
8cde333d36
|
update 3d doc
|
2015-04-01 09:47:09 +08:00 |
minggo
|
cb0c9ad6ee
|
Merge pull request #11233 from super626/texturecube
Bug fix: ios devices crash on release mode
|
2015-03-31 18:21:22 +08:00 |
minggo
|
c1cd041912
|
Merge pull request #11221 from super626/v3
3d animation quality control
|
2015-03-31 17:23:58 +08:00 |
zhukaixy
|
3835675cab
|
bugfix: TextureCube will be crashed on release environment
|
2015-03-31 16:56:02 +08:00 |
lvlong
|
336e719a2f
|
initialize _forceDepthWrite
|
2015-03-31 14:41:07 +08:00 |
lvlong
|
ab2c773c5c
|
clean all action from s_fadeInAnimates, s_fadeOutAnimates, s_runningAnimates!!!!
|
2015-03-31 14:26:40 +08:00 |
XiaoYang
|
45987b6a60
|
Merge pull request #276 from tangziwen/terrain
update Terrain, support skirt
|
2015-03-31 09:14:27 +08:00 |
tangziwen
|
1a93f87a15
|
update terrain
|
2015-03-30 18:25:22 +08:00 |
lvlong
|
cbdfd77400
|
modify some name.
|
2015-03-30 17:46:45 +08:00 |
lvlong
|
5032194e98
|
modify animate 3d quality to bool
|
2015-03-30 15:57:58 +08:00 |
samuele3hu
|
6c528c4a42
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_5_test
|
2015-03-30 15:51:01 +08:00 |
samuele3hu
|
c3ad458a26
|
Update comment for Lua
|
2015-03-30 15:47:47 +08:00 |
lvlong
|
6fe9f0d1c8
|
add comments for 3d animation quality!!!
|
2015-03-30 14:05:03 +08:00 |
yangxiao
|
c6a86ac287
|
move shader to shaders
|
2015-03-30 13:45:50 +08:00 |
lvlong
|
ccb5039411
|
Merge branch 'v3' of github.com:super626/cocos2d-x into v3
Conflicts:
cocos/base/CCConfiguration.h
|
2015-03-30 11:50:01 +08:00 |
lvlong
|
b2a7a753c2
|
add comments
|
2015-03-30 11:44:30 +08:00 |
minggo
|
59441adc2c
|
Merge pull request #11213 from super626/texturecube
Texturecube bug fix
|
2015-03-30 10:48:10 +08:00 |
yangxiao
|
b469cfa928
|
merge cocos
|
2015-03-30 10:28:14 +08:00 |
yangxiao
|
7affd8edcf
|
large value for min max
|
2015-03-30 10:00:06 +08:00 |
minggo
|
30db8ab7fa
|
Merge pull request #11159 from super626/v3
node animation support
|
2015-03-30 09:32:36 +08:00 |