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
songchengjiang 701d70fb6c Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
 		2014-08-29 10:58:04 +08:00
..
CCBatchCommand.cpp Add new line at the end of a file to *.cpp 2014-06-19 20:45:24 +09:00
CCBatchCommand.h add CC_DLL in Renderer folder 2014-07-14 17:02:06 +08:00
CCCustomCommand.cpp Add new line at the end of a file to *.cpp 2014-06-19 20:45:24 +09:00
CCCustomCommand.h add CC_DLL in Renderer folder 2014-07-14 17:02:06 +08:00
CCGLProgram.cpp add texture coord2-7 2014-08-21 18:14:24 +08:00
CCGLProgram.h add texture coord2-7 2014-08-21 18:14:24 +08:00
CCGLProgramCache.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCGLProgramCache.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCGLProgramState.cpp remove unneeded codes 2014-08-26 18:19:28 +08:00
CCGLProgramState.h add CC_DLL in Renderer folder 2014-07-14 17:02:06 +08:00
CCGLProgramStateCache.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCGLProgramStateCache.h add CC_DLL in Renderer folder 2014-07-14 17:02:06 +08:00
CCGroupCommand.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCGroupCommand.h add CC_DLL in Renderer folder 2014-07-14 17:02:06 +08:00
CCMeshCommand.cpp support multi-attribs 2014-08-20 18:20:19 +08:00
CCMeshCommand.h support multi-attribs 2014-08-20 18:20:19 +08:00
CCPrimitive.cpp fix warnings 2014-08-21 16:21:23 +08:00
CCPrimitive.h add CC_DLL for primitive classes 2014-08-12 11:56:21 +08:00
CCPrimitiveCommand.cpp change copyright 2014-08-07 15:53:20 +08:00
CCPrimitiveCommand.h add CC_DLL for primitive classes 2014-08-12 11:56:21 +08:00
CCQuadCommand.cpp roll back quadcommand 2014-06-27 12:44:19 +08:00
CCQuadCommand.h add CC_DLL in Renderer folder 2014-07-14 17:02:06 +08:00
CCRenderCommand.cpp Add new line at the end of a file to *.cpp 2014-06-19 20:45:24 +09:00
CCRenderCommand.h original version of PrimitiveCommand 2014-08-01 14:46:35 +08:00
CCRenderCommandPool.h Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCRenderer.cpp Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard 2014-08-29 10:58:04 +08:00
CCRenderer.h transparent render queue 2014-08-28 10:53:57 +08:00
CCTexture2D.cpp Change Image::PVRImagesHavePremultipliedAlpha() to Image::setPVRImagesHavePremultipliedAlpha() 2014-07-28 10:38:22 +08:00
CCTexture2D.h Change Image::PVRImagesHavePremultipliedAlpha() to Image::setPVRImagesHavePremultipliedAlpha() 2014-07-28 10:38:22 +08:00
CCTextureAtlas.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCTextureAtlas.h Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8. 2014-07-09 23:03:04 +08:00
CCTextureCache.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCTextureCache.h add new interfaces for TextureCache to unbind the bound image asynchronous load callbacks. 2014-05-23 17:08:22 +08:00
CCVertexIndexBuffer.cpp remove unneeded codes 2014-08-26 18:19:28 +08:00
CCVertexIndexBuffer.h fix android background and foreground crash for primitive 2014-08-15 14:05:17 +08:00
CCVertexIndexData.cpp remove unneeded codes 2014-08-26 18:19:28 +08:00
CCVertexIndexData.h add CC_DLL for primitive classes 2014-08-12 11:56:21 +08:00
ccGLStateCache.cpp fix bug for deleteTexture 2014-06-12 15:22:41 +08:00
ccGLStateCache.h add NORMAL, BLEND_WEIGHT, BLEND_INDEX flag to be correspondent to GLProgram::VertexAttrib 2014-08-05 15:15:17 +08:00
ccShader_3D_Color.frag Squashed commit of the following: 2014-05-18 14:49:16 -07:00
ccShader_3D_ColorTex.frag debug Sprite3D with .c3t 2014-06-09 18:37:58 +08:00
ccShader_3D_PositionTex.vert reset bone number to 60, put test in alphabetical order 2014-08-22 16:06:36 +08:00
ccShader_Label.vert Shader fixes for windows 2014-05-09 19:13:12 -07:00
ccShader_Label_df.frag Does not crash on Mac if the .ttf file is not found 2014-05-15 17:22:53 -07:00
ccShader_Label_df_glow.frag Does not crash on Mac if the .ttf file is not found 2014-05-15 17:22:53 -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_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 Squashed commit of the following: 2014-05-18 14:49:16 -07:00
ccShaders.h sprite3d with skin render&bundle 2014-06-05 16:36:01 +08:00