Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
20,897 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

10 Commits

Author SHA1 Message Date
yangxiao 1e319bc1f8 fix compile bug 2014-06-20 22:38:09 +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 fb7fc23ee9 refactor code 2014-06-17 10:49:52 +08:00
yangxiao dd8f66ce57 merge loader 2014-06-16 00:01:38 +08:00
Huabing.Xu f7b8acd6fd change pointer to std::vector for mesh 2014-06-13 11:59:13 +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
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