63 Commits

Author	SHA1	Message	Date
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