samuele3hu
|
91fd40dd3a
|
Add a newline for some files
|
2014-08-18 15:27:54 +08:00 |
samuele3hu
|
cb3f20ed47
|
Remove lib search paths for libcocos3d
|
2014-08-18 15:16:57 +08:00 |
samuele3hu
|
2d8ae3a917
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_3d_module
|
2014-08-18 15:08:04 +08:00 |
samuele3hu
|
e0168c373c
|
Add manual lua bindings for 3d and adjust related test case on different platform
|
2014-08-18 15:04:32 +08:00 |
samuele3hu
|
e3149ce41a
|
Split lua bindings for 3D from cocos2d
|
2014-08-18 15:00:40 +08:00 |
samuele3hu
|
7596a8a831
|
Split cocos3d from cocos2d on the android、win32 and linux platform and adjust the related test project
|
2014-08-18 14:58:57 +08:00 |
yangxiao
|
30ce92f677
|
obj work, make code clean
|
2014-08-18 14:16:34 +08:00 |
yangxiao
|
219404bd7d
|
change tex param
|
2014-08-18 11:42:41 +08:00 |
yangxiao
|
cd4da73beb
|
merge, obj not work now
|
2014-08-18 11:28:57 +08:00 |
yangxiao
|
79a55286ce
|
refactor to new model
|
2014-08-18 11:13:08 +08:00 |
minggo
|
eb408591d7
|
Merge pull request #7799 from CocosRobot/update_cocosfiles_1408088163
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-08-18 11:08:56 +08:00 |
minggo
|
7f43c212c9
|
Merge pull request #7801 from CocosRobot/update_lua_bindings_1408088565
[AUTO]: updating luabinding automatically
|
2014-08-18 11:08:23 +08:00 |
XiaoYang
|
619af3efbc
|
Merge pull request #101 from liuliang2004/Meshv3
Modified load static model
|
2014-08-18 10:32:41 +08:00 |
liuliang
|
2f816aea2c
|
Modified load static model
|
2014-08-18 10:32:23 +08:00 |
samuele3hu
|
6259aebdab
|
Split cocos3d from cocos2d on the android、win32 and linux platform and adjust the related test project
|
2014-08-17 23:45:56 +08:00 |
yangxiao
|
1e961e00b7
|
obj loader work
|
2014-08-17 22:49:53 +08:00 |
XiaoYang
|
05b13b8c38
|
Merge pull request #100 from lvlonggame/merge-bundle
draw sub mesh bug
|
2014-08-16 23:48:47 +08:00 |
samuele3hu
|
85ef11ae56
|
Split cocos3d from cocos2d on the iOS/Mac platform and adjust the related iOS/Mac test project
|
2014-08-16 21:51:39 +08:00 |
lvlong
|
da63032a46
|
draw sub mesh bug
|
2014-08-16 20:38:00 +08:00 |
XiaoYang
|
58aa6eee3f
|
Merge pull request #99 from lvlonggame/merge-bundle
Merge bundle
|
2014-08-16 19:53:46 +08:00 |
lvlong
|
b1c9fb99e3
|
animation is ok.
|
2014-08-16 19:51:59 +08:00 |
lvlong
|
9c41b1a826
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle
|
2014-08-16 18:20:29 +08:00 |
lvlong
|
4f4b8dc25c
|
for testing
|
2014-08-16 18:19:41 +08:00 |
yangxiao
|
fb1b7ca3bb
|
fix skeleton
|
2014-08-16 18:18:15 +08:00 |
lvlong
|
24bb827ef4
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle
|
2014-08-16 16:58:02 +08:00 |
yangxiao
|
7159914248
|
old model work
|
2014-08-16 16:56:04 +08:00 |
lvlong
|
4dd9102e87
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle
|
2014-08-16 15:45:28 +08:00 |
lvlong
|
5b59b8a987
|
fixed some loading problems.
|
2014-08-16 15:40:00 +08:00 |
yangxiao
|
a11ac316bf
|
create model
|
2014-08-16 14:52:44 +08:00 |
yangxiao
|
8a5bbabe21
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2014-08-16 14:49:47 +08:00 |
yangxiao
|
47d15a4aa1
|
load
|
2014-08-16 14:49:38 +08:00 |
XiaoYang
|
7844e3649b
|
Merge pull request #98 from lvlonggame/merge-bundle
Merge bundle
|
2014-08-16 14:47:13 +08:00 |
lvlong
|
84dcff2f7a
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle
Conflicts:
cocos/3d/CCBundle3D.cpp
|
2014-08-16 14:44:41 +08:00 |
lvlong
|
d60a7734b1
|
merge bundle.
|
2014-08-16 14:28:15 +08:00 |
yangxiao
|
ae361c91cd
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2014-08-16 14:16:27 +08:00 |
yangxiao
|
ef2db59825
|
modify render
|
2014-08-16 14:16:17 +08:00 |
XiaoYang
|
41d35139a4
|
Merge pull request #97 from liuliang2004/Meshv3
Modify the material parsing
|
2014-08-16 14:15:19 +08:00 |
liuliang
|
ae79603791
|
Modify the material parsing
|
2014-08-16 14:14:37 +08:00 |
lvlong
|
f8f416cd3c
|
merge bundle
|
2014-08-16 11:12:26 +08:00 |
Thomas Hou
|
6a641ee587
|
add BillBoard to iOS project
|
2014-08-16 11:12:07 +08:00 |
XiaoYang
|
15a1daa1af
|
Merge pull request #95 from liuliang2004/Meshv3
Meshv3
|
2014-08-16 10:43:53 +08:00 |
liuliang
|
21dcc51c0f
|
Modify the material parsing
|
2014-08-16 10:41:42 +08:00 |
liuliang
|
1b92409d78
|
Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3
|
2014-08-16 09:59:25 +08:00 |
liuliang
|
f35dd346eb
|
Modify Analytic
|
2014-08-16 09:59:08 +08:00 |
yangxiao
|
3ab7c6b952
|
create from bundle data
|
2014-08-15 20:52:45 +08:00 |
XiaoYang
|
727a4cb885
|
Merge pull request #93 from songmiao/billboard
Billboard Merge v3
|
2014-08-15 19:04:56 +08:00 |
liuliang
|
b4a20feabc
|
Parse the data file
|
2014-08-15 18:27:28 +08:00 |
yangxiao
|
9ab48bd71e
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2014-08-15 18:27:03 +08:00 |
XiaoYang
|
39bb934134
|
Merge pull request #94 from liuliang2004/Meshv3
Meshv3
|
2014-08-15 18:26:33 +08:00 |
yangxiao
|
a740841f5e
|
submeshid
|
2014-08-15 18:21:58 +08:00 |