Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/renderer
History
Huabing.Xu 0367d752af Merge branch 'v3' into v3_comments 
Conflicts:
	cocos/renderer/ccShaders.h
 		2015-03-27 12:05:15 +08:00
..
CCBatchCommand.cpp Refactor draw command 2015-01-15 14:00:49 -08:00
CCBatchCommand.h [ci skip]add group base to files in renderer folder 2015-03-27 11:54:40 +08:00
CCCustomCommand.cpp Refactor draw command 2015-01-15 14:00:49 -08:00
CCCustomCommand.h [ci skip]add group base to files in renderer folder 2015-03-27 11:54:40 +08:00
CCGLProgram.cpp merge cocos 2015-03-26 11:59:26 +08:00
CCGLProgram.h Merge branch 'v3' into v3_comments 2015-03-27 12:05:15 +08:00
CCGLProgramCache.cpp merge cocos 2015-03-26 11:59:26 +08:00
CCGLProgramCache.h [ci skip]add group base to files in renderer folder 2015-03-27 11:54:40 +08:00
CCGLProgramState.cpp solve the problems noted in comments 2015-01-30 17:23:30 +08:00
CCGLProgramState.h [ci skip]add group base to files in renderer folder 2015-03-27 11:54:40 +08:00
CCGLProgramStateCache.cpp comment line 83 2014-12-18 13:49:54 +08:00
CCGLProgramStateCache.h [ci skip]add group base to files in renderer folder 2015-03-27 11:54:40 +08:00
CCGroupCommand.cpp Update CCGroupCommand.cpp 2015-01-20 19:28:30 +08:00
CCGroupCommand.h [ci skip]add group base to files in renderer folder 2015-03-27 11:54:40 +08:00
CCMeshCommand.cpp check running scene 2015-03-16 18:04:50 +08:00
CCMeshCommand.h add 3D doc, fixed typo 2015-03-20 17:20:22 +08:00
CCPrimitive.cpp fix conflict 2014-08-29 16:55:09 +08:00
CCPrimitive.h [ci skip]add group base to files in renderer folder 2015-03-27 11:54:40 +08:00
CCPrimitiveCommand.cpp Refactor draw command 2015-01-15 14:00:49 -08:00
CCPrimitiveCommand.h [ci skip]add group base to files in renderer folder 2015-03-27 11:54:40 +08:00
CCQuadCommand.cpp Refactor draw command 2015-01-15 14:00:49 -08:00
CCQuadCommand.h [ci skip]add group base to files in renderer folder 2015-03-27 11:54:40 +08:00
CCRenderCommand.cpp fix transparent render bug 2015-03-03 10:42:47 +08:00
CCRenderCommand.h [ci skip]add group base to files in renderer folder 2015-03-27 11:54:40 +08:00
CCRenderCommandPool.h [ci skip]Update comments 2015-03-24 20:23:51 +08:00
CCRenderer.cpp resolve conflict 2015-02-13 15:46:19 +08:00
CCRenderer.h [ci skip]add group base to files in renderer folder 2015-03-27 11:54:40 +08:00
CCTexture2D.cpp check for PixelFormat::DEFAULT 2014-10-14 14:21:02 -07:00
CCTexture2D.h fixed doxygen warning for physics and texture2d 2015-03-27 10:34:01 +08:00
CCTextureAtlas.cpp fix crash for textureAtlas 2015-01-21 14:14:53 +08:00
CCTextureAtlas.h Modify group name for physics and Texture2d, Texture2dCache, TextureAtlas. 2015-03-26 15:20:25 +08:00
CCTextureCache.cpp fix memory leak when reload texture 2014-10-20 10:43:18 +08:00
CCTextureCache.h Modify group name for physics and Texture2d, Texture2dCache, TextureAtlas. 2015-03-26 15:20:25 +08:00
CCTrianglesCommand.cpp Refactor draw command 2015-01-15 14:00:49 -08:00
CCTrianglesCommand.h [ci skip]add group base to files in renderer folder 2015-03-27 11:54:40 +08:00
CCVertexIndexBuffer.cpp add param for usage in class VertexBuffer and IndexBuffer 2015-01-12 14:59:12 +08:00
CCVertexIndexBuffer.h [ci skip]add group base to files in renderer folder 2015-03-27 11:54:40 +08:00
CCVertexIndexData.cpp remove unneeded includes 2014-08-29 15:39:52 +08:00
CCVertexIndexData.h [ci skip]add group base to files in renderer folder 2015-03-27 11:54:40 +08:00
CMakeLists.txt Multi platform cmake support 2014-10-03 23:21:45 +01:00
ccGLStateCache.cpp solve the problems noted in comments 2015-01-30 17:23:30 +08:00
ccGLStateCache.h merge cocos 2015-03-26 11:59:26 +08:00
ccShader_3D_Color.frag Name modification 2014-08-21 11:33:00 +08:00
ccShader_3D_ColorNormal.frag fix the bug of lighting shader 2015-03-17 16:43:08 +08:00
ccShader_3D_ColorNormalTex.frag fix the bug of lighting shader 2015-03-17 16:43:08 +08:00
ccShader_3D_ColorTex.frag Name modification 2014-08-21 11:33:00 +08:00
ccShader_3D_Particle.frag add 3d particle (Particle Universe) 2015-02-11 18:14:22 +08:00
ccShader_3D_Particle.vert add 3d particle (Particle Universe) 2015-02-11 18:14:22 +08:00
ccShader_3D_PositionNormalTex.vert shader optimize 2014-10-20 13:41:26 +08:00
ccShader_3D_PositionTex.vert shader optimize 2014-10-20 13:41:26 +08:00
ccShader_3D_Skybox.frag merge cocos 2015-03-26 11:59:26 +08:00
ccShader_3D_Skybox.vert merge cocos 2015-03-26 11:59:26 +08:00
ccShader_Label.vert Shader fixes for windows 2014-05-09 19:13:12 -07:00
ccShader_Label_df.frag Adds MARK: TODO: FIXME: in code 2014-08-29 12:54:24 -07:00
ccShader_Label_df_glow.frag Adds MARK: TODO: FIXME: in code 2014-08-29 12:54:24 -07:00
ccShader_Label_normal.frag Does not crash on Mac if the .ttf file is not found 2014-05-15 17:22:53 -07:00
ccShader_Label_outline.frag Does not crash on Mac if the .ttf file is not found 2014-05-15 17:22:53 -07:00
ccShader_PositionColor.frag Shader fixes for windows 2014-05-09 19:13:12 -07:00
ccShader_PositionColor.vert Shader fixes for windows 2014-05-09 19:13:12 -07:00
ccShader_PositionColorLengthTexture.frag Shader fixes for windows 2014-05-09 19:13:12 -07:00
ccShader_PositionColorLengthTexture.vert Shader fixes for windows 2014-05-09 19:13:12 -07:00
ccShader_PositionColorTextureAsPointsize.vert fix crash on windows 2015-01-20 16:50:51 +08:00
ccShader_PositionTexture.frag uniform sampler CC_Texture0 MUST NOT be defined on shaders 2014-05-15 16:47:54 -07:00
ccShader_PositionTexture.vert Shader fixes for windows 2014-05-09 19:13:12 -07:00
ccShader_PositionTextureA8Color.frag uniform sampler CC_Texture0 MUST NOT be defined on shaders 2014-05-15 16:47:54 -07:00
ccShader_PositionTextureA8Color.vert Shader fixes for windows 2014-05-09 19:13:12 -07:00
ccShader_PositionTextureColor.frag uniform sampler CC_Texture0 MUST NOT be defined on shaders 2014-05-15 16:47:54 -07:00
ccShader_PositionTextureColor.vert Compiles on windows, sort of 2014-05-09 19:07:22 -07:00
ccShader_PositionTextureColorAlphaTest.frag uniform sampler CC_Texture0 MUST NOT be defined on shaders 2014-05-15 16:47:54 -07:00
ccShader_PositionTextureColor_noMVP.frag uniform sampler CC_Texture0 MUST NOT be defined on shaders 2014-05-15 16:47:54 -07:00
ccShader_PositionTextureColor_noMVP.vert Shader fixes for windows 2014-05-09 19:13:12 -07:00
ccShader_PositionTexture_uColor.frag uniform sampler CC_Texture0 MUST NOT be defined on shaders 2014-05-15 16:47:54 -07:00
ccShader_PositionTexture_uColor.vert Shader fixes for windows 2014-05-09 19:13:12 -07:00
ccShader_Position_uColor.frag Shader fixes for windows 2014-05-09 19:13:12 -07:00
ccShader_Position_uColor.vert Shader fixes for windows 2014-05-09 19:13:12 -07:00
ccShaders.cpp merge cocos 2015-03-26 11:59:26 +08:00
ccShaders.h Merge branch 'v3' into v3_comments 2015-03-27 12:05:15 +08:00