axmol/cocos/3d
WuHao 0808b6aff9 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon
Conflicts:
	cocos/2d/MarchingSquare.cpp
2015-06-08 13:59:26 +08:00
..
Android.mk merge cocos 2015-03-30 10:28:14 +08:00
CCAABB.cpp deal aabb 2014-08-18 17:02:13 +08:00
CCAABB.h ignore some method ,fix typo 2015-04-01 10:23:53 +08:00
CCAnimate3D.cpp modify some about animate3D quality! 2015-04-24 11:49:28 +08:00
CCAnimate3D.h modify comments 2015-04-24 14:06:20 +08:00
CCAnimation3D.cpp add to animation cache 2015-04-13 17:14:58 +08:00
CCAnimation3D.h ignore some method ,fix typo 2015-04-01 10:23:53 +08:00
CCAnimationCurve.h removed CC_PLATFORM_WP8 2015-05-08 09:19:13 -07:00
CCAnimationCurve.inl fix bug: animation curve memory leak ! 2015-04-23 14:35:37 +08:00
CCAttachNode.cpp modify according to minggo 2015-02-12 16:09:08 +08:00
CCAttachNode.h ignore some method ,fix typo 2015-04-01 10:23:53 +08:00
CCBillBoard.cpp Polyinfo is no longer a pointer 2015-06-04 16:20:00 +08:00
CCBillBoard.h ignore some method ,fix typo 2015-04-01 10:23:53 +08:00
CCBundle3D.cpp fix assert failure of NinePatchImageParser and rapidjson 2015-05-26 17:20:10 +08:00
CCBundle3D.h add getTriangleList to bundle 2015-05-14 10:30:20 +08:00
CCBundle3DData.h Merge pull request #11572 from super626/v3 2015-04-24 16:42:33 +08:00
CCBundleReader.cpp Tabs to spaces 2015-01-29 10:40:00 +01:00
CCBundleReader.h ignore some method ,fix typo 2015-04-01 10:23:53 +08:00
CCFrustum.cpp modify code format. 2014-12-23 09:57:46 +08:00
CCFrustum.h Update comment for Lua 2015-03-30 15:47:47 +08:00
CCMesh.cpp samplers are treated as uniforms 2015-06-05 14:55:33 -07:00
CCMesh.h Adds support of VertexAttribBinding per Pass 2015-05-12 19:58:09 -07:00
CCMeshSkin.cpp Fixed warnings 2015-01-29 01:36:22 +01:00
CCMeshSkin.h ignore some method ,fix typo 2015-04-01 10:23:53 +08:00
CCMeshVertexIndexData.cpp weak ref to vertexdata 2015-04-09 10:52:05 +08:00
CCMeshVertexIndexData.h correct words 2015-04-09 11:31:56 +08:00
CCOBB.cpp Optimize Vec3 2015-04-05 13:09:50 +03:00
CCOBB.h ignore some method ,fix typo 2015-04-01 10:23:53 +08:00
CCObjLoader.cpp fix bug: load *.obj can't load sub-mesh material. 2015-03-24 16:03:51 +08:00
CCObjLoader.h ignore some method ,fix typo 2015-04-01 10:23:53 +08:00
CCPlane.cpp feedback commit. 2014-12-22 18:13:07 +08:00
CCPlane.h Update comment for Lua 2015-03-30 15:47:47 +08:00
CCRay.cpp modify by colleague for cocostudio. 2015-01-16 13:23:03 +08:00
CCRay.h ignore some method ,fix typo 2015-04-01 10:23:53 +08:00
CCSkeleton3D.cpp Optimize Vec3 use constructor default. 2015-04-20 12:56:43 +03:00
CCSkeleton3D.h Optimize Vec3 use constructor default. 2015-04-20 12:56:43 +03:00
CCSkybox.cpp Fix bug: skybox can't move to other position except origin point in world space. 2015-05-26 17:14:26 +08:00
CCSkybox.h Merge pull request #11250 from super626/texturecube 2015-04-02 09:38:26 +08:00
CCSprite3D.cpp samplers are treated as uniforms 2015-06-05 14:55:33 -07:00
CCSprite3D.h Adds support of VertexAttribBinding per Pass 2015-05-12 19:58:09 -07:00
CCSprite3DMaterial.cpp remove unneeded includes 2014-08-29 15:39:52 +08:00
CCSprite3DMaterial.h ignore some method ,fix typo 2015-04-01 10:23:53 +08:00
CCTerrain.cpp Fix bug: terrain can't move to other position except origin point. 2015-05-26 17:51:26 +08:00
CCTerrain.h Terrain uses StateBlock 2015-05-19 17:18:44 -07:00
CCTextureCube.cpp check for PixelFormat::DEFAULT 2015-04-21 18:11:56 -07:00
CCTextureCube.h ignore some method ,fix typo 2015-04-01 10:23:53 +08:00
CMakeLists.txt Squashed commit of the following: 2015-05-05 13:07:32 -07:00
cocos3d.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00