liuliang
|
21dcc51c0f
|
Modify the material parsing
|
2014-08-16 10:41:42 +08:00 |
liuliang
|
4c8b24d113
|
Modify the binary parsing
|
2014-08-15 15:32:15 +08:00 |
yangxiao
|
fdcec51cf4
|
struct for newmodel
|
2014-08-15 13:03:53 +08:00 |
yangxiao
|
2c29560514
|
add CC_DLL
|
2014-07-31 10:28:39 +08:00 |
yangxiao
|
9f1cfbfca5
|
add skeleton and refactor skin
|
2014-07-30 18:32:34 +08:00 |
yangxiao
|
da4ba95806
|
SubMesh and Attachment
|
2014-07-29 10:49:06 +08:00 |
lvlong
|
42aaf38468
|
modify reader-64bit bug
|
2014-06-30 17:10:07 +08:00 |
lvlong
|
ab910dfe19
|
reader test
|
2014-06-25 09:13:24 +08:00 |
lvlong
|
e48982aeaa
|
unsigned int -> size_t
|
2014-06-23 11:12:08 +08:00 |
lvlong
|
69436ddd65
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
Conflicts:
cocos/3d/CCBundle3D.cpp
cocos/3d/CCBundle3D.h
cocos/3d/CCBundle3DData.h
|
2014-06-20 16:02:22 +08:00 |
lvlong
|
e4bbfad773
|
1. binary loader is OK.
2. add some comment.
|
2014-06-20 15:30:08 +08:00 |
lvlong
|
8493c4579b
|
before switch branch save
|
2014-06-19 15:43:02 +08:00 |
yangxiao
|
c5bb10e5f4
|
add comments
|
2014-06-19 14:11:14 +08:00 |
yangxiao
|
1ba59fba94
|
code adjustment according to minggo
|
2014-06-17 19:18:56 +08:00 |
yangxiao
|
6c39dc0e18
|
adjust includes
|
2014-06-17 15:28:14 +08:00 |
lvlong
|
ef32bffceb
|
modify bundle3D load()
|
2014-06-17 13:59:03 +08:00 |
yangxiao
|
b9824e1778
|
remove external from include path
|
2014-06-17 21:16:32 +08:00 |
yangxiao
|
189fbb7071
|
resolve conflict
|
2014-06-17 10:52:48 +08:00 |
yangxiao
|
fb7fc23ee9
|
refactor code
|
2014-06-17 10:49:52 +08:00 |
Huabing.Xu
|
07ec5970fb
|
1. using external/json folder for rapidjson
2. linux works now
|
2014-06-16 19:18:02 -07:00 |
lvlong
|
32cc5b12d6
|
ready
|
2014-06-16 19:30:45 +08:00 |
lvlong
|
4b7f6a6185
|
static Sprite3D is ok
|
2014-06-16 19:08:43 +08:00 |
yangxiao
|
2c6f7b63d1
|
avoid reopen file
|
2014-06-16 18:46:58 +08:00 |
lvlong
|
1ca69d2689
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
Conflicts:
cocos/3d/CCBundle3D.cpp
cocos/3d/CCBundle3D.h
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
|
2014-06-12 16:28:36 +08:00 |
lvlong
|
742ea7f2df
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
Conflicts:
cocos/2d/cocos2d.vcxproj.filters
cocos/3d/CCBundle3D.cpp
cocos/3d/CCBundle3D.h
|
2014-06-12 15:53:41 +08:00 |
Huabing.Xu
|
e70918e325
|
extract Animation3DData
|
2014-06-12 14:03:33 +08:00 |
lvlong
|
9fe7c1a9da
|
loader
|
2014-06-12 10:01:54 +08:00 |
Huabing.Xu
|
f1bc0971aa
|
extract mesh data, material data, skin data into a header file for reuse in converter and engine
|
2014-06-11 18:24:14 +08:00 |
yangxiao
|
a991940268
|
debug Sprite3D with .c3t
|
2014-06-09 18:37:58 +08:00 |
yangxiao
|
0c95fe1fbd
|
animation test
|
2014-06-06 19:12:08 +08:00 |
yangxiao
|
32ba5f2873
|
change comment
|
2014-06-05 16:47:03 +08:00 |
yangxiao
|
ed8f8a9cad
|
sprite3d with skin render&bundle
|
2014-06-05 16:36:01 +08:00 |