axmol/cocos/3d
songmiao 08a4ebba06 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into billboard
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h
2014-08-15 17:43:04 +08:00
..
CCAABB.cpp optimize Sprite3D get aabb. 2014-08-12 13:45:06 +08:00
CCAABB.h optimize Sprite3D get aabb. 2014-08-12 13:45:06 +08:00
CCAnimate3D.cpp add skeleton and refactor skin 2014-07-30 18:32:34 +08:00
CCAnimate3D.h add CC_DLL for 3d 2014-07-15 09:45:43 +08:00
CCAnimation3D.cpp adjust api according feedback 2014-07-09 09:53:15 +08:00
CCAnimation3D.h add CC_DLL for 3d 2014-07-15 09:45:43 +08:00
CCAnimationCurve.h add comments 2014-06-19 14:11:14 +08:00
CCAnimationCurve.inl fix warnings 2014-06-26 16:15:02 +08:00
CCAttachNode.cpp adjust 2014-07-31 20:20:29 +08:00
CCAttachNode.h SubMesh and Attachment 2014-07-29 10:49:06 +08:00
CCBillBoard.cpp Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into billboard 2014-08-15 17:43:04 +08:00
CCBillBoard.h Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into billboard 2014-08-15 17:43:04 +08:00
CCBundle3D.cpp add comment 2014-07-31 18:28:52 +08:00
CCBundle3D.h add CC_DLL 2014-07-31 10:28:39 +08:00
CCBundle3DData.h code style adjust according minggo 2014-07-31 18:14:01 +08:00
CCBundleReader.cpp SubMesh and Attachment 2014-07-29 10:49:06 +08:00
CCBundleReader.h fixed compile error. 2014-07-19 18:29:52 +08:00
CCMesh.cpp for pull request modify!! 2014-08-11 10:40:34 +08:00
CCMesh.h for pull request modify!! 2014-08-11 10:40:34 +08:00
CCMeshSkin.cpp adjust 2014-07-31 20:17:51 +08:00
CCMeshSkin.h export MeshSkin as CC_DLL 2014-08-12 14:41:25 +08:00
CCOBB.cpp modify function name and add default to switch block. 2014-08-14 13:15:37 +08:00
CCOBB.h modify function name and add default to switch block. 2014-08-14 13:15:37 +08:00
CCObjLoader.cpp Change atof() to utils::atof() 2014-07-14 20:45:24 +08:00
CCObjLoader.h Squashed commit of the following: 2014-05-18 14:49:16 -07:00
CCRay.cpp for pull request modify!! 2014-08-11 10:40:34 +08:00
CCRay.h remove normalize 2014-08-09 00:02:40 +08:00
CCSkeleton3D.cpp add Quaternion::ZERO 2014-07-31 18:36:30 +08:00
CCSkeleton3D.h code style adjust according minggo 2014-07-31 18:14:01 +08:00
CCSprite3D.cpp Merge branch 'newcode' into obb 2014-08-14 18:58:46 +08:00
CCSprite3D.h merge cocos2d 2014-08-14 17:16:20 +08:00
CCSprite3DMaterial.cpp code adjustment according to minggo 2014-06-17 19:18:56 +08:00
CCSprite3DMaterial.h add comments 2014-06-19 14:11:14 +08:00
CCSubMesh.cpp SubMesh and Attachment 2014-07-29 10:49:06 +08:00
CCSubMesh.h SubMesh and Attachment 2014-07-29 10:49:06 +08:00
CCSubMeshState.cpp add skeleton and refactor skin 2014-07-30 18:32:34 +08:00
CCSubMeshState.h add skeleton and refactor skin 2014-07-30 18:32:34 +08:00
CMakeLists.txt merge cocos2d 2014-08-08 16:25:52 +08:00