Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/3d
History
pandamicro 022bcc24f1 Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.cpp
	cocos/scripting/js-bindings/manual/component/CCComponentJS.cpp
	cocos/scripting/js-bindings/manual/js_bindings_opengl.cpp
 		2015-12-20 22:56:33 +08:00
..
Android.mk add motionstreak3d 2015-09-01 11:02:22 +08:00
CCAABB.cpp deal aabb 2014-08-18 17:02:13 +08:00
CCAABB.h fix typos 2015-09-09 11:37:41 +08:00
CCAnimate3D.cpp fix typos 2015-09-09 11:37:41 +08:00
CCAnimate3D.h fix typos 2015-09-09 11:37:41 +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 fix typos 2015-09-09 11:37:41 +08: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 Fixed bug: wrong usage of isVisitableByVisitingCamera, which should only effect draw call. 2015-06-18 10:32:30 +08:00
CCBillBoard.h fix typos 2015-09-09 11:37:41 +08:00
CCBundle3D.cpp Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +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 fix typos 2015-09-09 11:37:41 +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 update for 3D object render, revert old changes 2015-12-18 11:23:33 +08:00
CCMesh.h update for 3D object render, revert old changes 2015-12-18 11:23:33 +08:00
CCMeshSkin.cpp Fixed warnings 2015-01-29 01:36:22 +01:00
CCMeshSkin.h Fix typo in documentation and comments 2015-12-09 01:48:24 +09:00
CCMeshVertexIndexData.cpp weak ref to vertexdata 2015-04-09 10:52:05 +08:00
CCMeshVertexIndexData.h revert glprogram 2015-12-03 16:29:02 +08:00
CCMotionStreak3D.cpp add motionstreak3d 2015-08-28 11:40:12 +08:00
CCMotionStreak3D.h add CC_DLL 2015-09-02 15:55:58 +08:00
CCOBB.cpp Optimize Vec3 2015-04-05 13:09:50 +03:00
CCOBB.h fix typos 2015-09-09 11:37:41 +08:00
CCObjLoader.cpp Fix typo in documentation and comments 2015-12-09 01:48:24 +09:00
CCObjLoader.h Fix typo in documentation and comments 2015-12-09 01:48:24 +09:00
CCPlane.cpp revert ccplane 2015-11-30 14:53:37 +08:00
CCPlane.h revert ccplane 2015-11-30 14:53:37 +08:00
CCRay.cpp fixed bug #21800 [CppTest]Node: Scene3D when player outof terrain app will no response. 2015-08-07 17:36:35 +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 fix typos 2015-09-09 11:37:41 +08:00
CCSkybox.cpp disable blend when drawing skybox 2015-08-25 14:32:25 +08:00
CCSkybox.h fix typos 2015-09-09 11:37:41 +08:00
CCSprite3D.cpp fxi model bug 2015-12-08 16:32:06 +08:00
CCSprite3D.h resolve conflict and fix checktexture bug 2015-12-02 11:26:05 +08:00
CCSprite3DMaterial.cpp builtin material normal map support 2015-12-01 10:37:53 +08:00
CCSprite3DMaterial.h builtin material normal map support 2015-12-01 10:37:53 +08:00
CCTerrain.cpp Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
CCTerrain.h Fix typo in documentation and comments 2015-12-09 01:48:24 +09:00
CMakeLists.txt add motionstreak3d 2015-09-01 11:02:22 +08:00
cocos3d.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00