3 Commits

Author	SHA1	Message	Date
lvlong	4ae01d148f	11	2014-06-13 19:26:46 +08:00
lvlong	14f4b6430f	modify 3dloader, you can run animation.	2014-06-12 18:26:42 +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