yangxiao
|
87850d0378
|
rename Animate::createWithFrames
|
2014-10-17 11:16:07 +08:00 |
XiaoYang
|
ed5f5d7229
|
Merge pull request #143 from tangziwen/v3
fix Zorder for transparent mesh
|
2014-10-17 11:14:01 +08:00 |
tangziwen
|
d14b30ecac
|
fix tab style
|
2014-10-17 10:59:53 +08:00 |
tangziwen
|
69cda9ccae
|
fix duplicate function in create dummy texture
|
2014-10-17 08:58:05 +08:00 |
tangziwen
|
f7888d9798
|
tab style fix
|
2014-10-15 17:01:56 +08:00 |
tangziwen
|
6ed31fa47e
|
fix some dummy texture bugs , supply some comments
|
2014-10-15 16:25:14 +08:00 |
tangziwen
|
cd1d2289a6
|
bug fix
|
2014-10-15 11:36:44 +08:00 |
tangziwen
|
29b255fa36
|
use a pure red dummy texture to indicate Sprite3d texture missing
|
2014-10-15 10:39:18 +08:00 |
tangziwen
|
473c9e90b2
|
fix Zorder for transparent mesh
|
2014-10-14 16:59:41 +08:00 |
yangxiao
|
530bc96dd5
|
add comment
|
2014-10-14 10:50:54 +08:00 |
yangxiao
|
70f4ca2a4a
|
Merge branch 'newcode' into v3
|
2014-10-14 09:28:17 +08:00 |
XiaoYang
|
c171a8772d
|
Merge pull request #140 from tangziwen/v3
fix mesh AABB incorrect calculation through using static variable
|
2014-10-14 09:23:13 +08:00 |
tangziwen
|
7566880d46
|
fix mesh's AABB calculation incorrect by using static variable
|
2014-10-14 09:14:46 +08:00 |
tangziwen
|
e8007b9e63
|
fix mesh AABB incorrect calculation through using static variable
|
2014-10-13 17:49:00 +08:00 |
yangxiao
|
d81e4d7a92
|
fix light uniform array errors, and using shader without light by default fix #8612
|
2014-10-13 15:17:22 +08:00 |
XiaoYang
|
72e6204426
|
Merge pull request #138 from lvlonggame/v3
add create Animate3D interface by frame section
|
2014-10-11 17:36:37 +08:00 |
lvlong
|
6be64fedd7
|
modify Animate3D::create
|
2014-10-11 17:02:42 +08:00 |
lvlong
|
4bba69d578
|
add a param comment
|
2014-10-10 17:48:54 +08:00 |
lvlong
|
2c18db5b18
|
create animate by frame section.
|
2014-10-10 17:44:45 +08:00 |
Huabing.Xu
|
a08d0e4be3
|
Merge branch 'v3' into v3_fixGLProgramCrash
|
2014-10-10 15:05:09 +08:00 |
yangxiao
|
a67825e950
|
use shader without light by default
|
2014-10-10 15:01:14 +08:00 |
Huabing.Xu
|
e69465e428
|
remove texture unit 4-7, only 0 -3 is reserved
|
2014-10-10 14:06:37 +08:00 |
yangxiao
|
88fc4258ca
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2014-10-09 17:02:10 +08:00 |
Ricardo Quesada
|
d326db427f
|
removes the `3d_export.h` file
|
2014-10-08 18:30:23 -07:00 |
lvlong
|
cba155b5bc
|
Remove string err no used
|
2014-10-08 15:23:31 +08:00 |
martell
|
d420ae39e2
|
Added CC_STATIC support for 3d, all these commits will be squashed and renamed, structured and signed at the end
Signed-off-by: martell <martellmalone@gmail.com>
|
2014-10-03 23:22:27 +01:00 |
martell
|
c3172bef50
|
Finalise Windows cmake support for mingw-w64
Signed-off-by: martell <martellmalone@gmail.com>
|
2014-10-03 23:22:09 +01:00 |
martell
|
ecd8a02ee6
|
Fixed up some more cmake errors
Signed-off-by: martell <martellmalone@gmail.com>
|
2014-10-03 23:22:01 +01:00 |
martell
|
30240a8a37
|
Multi platform cmake support
Signed-off-by: martell <martellmalone@gmail.com>
|
2014-10-03 23:21:45 +01:00 |
yangxiao
|
38873dd999
|
move light fix linux and android
|
2014-09-28 16:05:20 +08:00 |
yangxiao
|
dbf564208b
|
move light from 3d to base
|
2014-09-28 16:02:12 +08:00 |
yangxiao
|
744e09c141
|
reset change to getDirectionInWorld
|
2014-09-28 11:03:18 +08:00 |
yangxiao
|
53dee7ef86
|
can ci android compile?
|
2014-09-28 10:21:47 +08:00 |
yangxiao
|
db2ff49f26
|
adjust according to minggo
|
2014-09-26 14:13:26 +08:00 |
yangxiao
|
e2f1b91117
|
remove unused variable
|
2014-09-25 22:25:43 +08:00 |
yangxiao
|
90523fc3d5
|
fix light check
|
2014-09-25 22:24:47 +08:00 |
yangxiao
|
ca9eb3d203
|
support ambient light without normal & optimaze code
|
2014-09-25 18:32:33 +08:00 |
yangxiao
|
8f3f37c2bb
|
auto switch shader according to light status
|
2014-09-25 17:13:46 +08:00 |
yangxiao
|
567c632d98
|
config max support light number in shader
|
2014-09-25 15:29:32 +08:00 |
yangxiao
|
56313aa895
|
merge cocos
|
2014-09-25 11:05:02 +08:00 |
songchengjiang
|
b51dc584d5
|
Light optimization
|
2014-09-23 17:08:28 +08:00 |
songchengjiang
|
216c40fe9e
|
Modified Light Shader
|
2014-09-22 18:08:58 +08:00 |
yangxiao
|
61def04ca6
|
add light mask
|
2014-09-22 11:14:30 +08:00 |
minggo
|
653986a3a2
|
Merge pull request #8106 from super626/v3
add OBBs to OBB collision test by default, Fix 0.1 version static model load bug and remove unused resource
|
2014-09-19 16:16:33 +08:00 |
yangxiao
|
5b61e569f5
|
light mask
|
2014-09-19 14:50:20 +08:00 |
XiaoYang
|
d1328cfb41
|
Merge pull request #132 from lvlonggame/v3
Deal read string length problem!
|
2014-09-19 14:47:59 +08:00 |
lvlong
|
eb89efe510
|
deal the length problem!
|
2014-09-19 14:30:02 +08:00 |
songchengjiang
|
f052e45c04
|
Move Light Uniforms into Meshcommand
|
2014-09-19 10:54:07 +08:00 |
songchengjiang
|
62777e9552
|
compile Android
|
2014-09-18 18:35:18 +08:00 |
songchengjiang
|
3c67515378
|
Finished light reconstruction
|
2014-09-18 16:38:35 +08:00 |