axmol/cocos/renderer
Huabing.Xu 41d19007eb Merge branch 'v3.1hotfix' into v3
Conflicts:
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h
2014-05-30 10:19:56 +08:00
..
CCBatchCommand.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCBatchCommand.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCCustomCommand.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCCustomCommand.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCGLProgram.cpp updated link() for wp8 2014-05-20 11:47:33 -07:00
CCGLProgram.h Squashed commit of the following: 2014-05-18 14:49:16 -07:00
CCGLProgramCache.cpp Squashed commit of the following: 2014-05-18 14:49:16 -07:00
CCGLProgramCache.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCGLProgramState.cpp remove foreground event listener when GLProgramState is deleted 2014-05-28 16:51:33 +08:00
CCGLProgramState.h using lambda function instead of member function 2014-05-28 15:50:37 +08:00
CCGLProgramStateCache.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCGLProgramStateCache.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCGroupCommand.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCGroupCommand.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCMeshCommand.cpp Squashed commit of the following: 2014-05-18 14:49:16 -07:00
CCMeshCommand.h Squashed commit of the following: 2014-05-18 14:49:16 -07:00
CCQuadCommand.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCQuadCommand.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCRenderCommand.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCRenderCommand.h Squashed commit of the following: 2014-05-18 14:49:16 -07:00
CCRenderCommandPool.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCRenderer.cpp Squashed commit of the following: 2014-05-18 14:49:16 -07:00
CCRenderer.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCTexture2D.cpp [hot fixed]issue#4999:fixed label is unsharp if it's created by smaller font. 2014-05-29 10:26:07 +08:00
CCTexture2D.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCTextureAtlas.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCTextureAtlas.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCTextureCache.cpp remove new lines 2014-05-23 18:01:17 +08:00
CCTextureCache.h add new interfaces for TextureCache to unbind the bound image asynchronous load callbacks. 2014-05-23 17:08:22 +08:00
CMakeLists.txt Squashed commit of the following: 2014-05-18 14:49:16 -07:00
ccGLStateCache.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
ccGLStateCache.h GLProgramState fixes 2014-05-12 19:12:56 -07:00
ccShader_3D_Color.frag Squashed commit of the following: 2014-05-18 14:49:16 -07:00
ccShader_3D_ColorTex.frag Squashed commit of the following: 2014-05-18 14:49:16 -07:00
ccShader_3D_PositionTex.vert Squashed commit of the following: 2014-05-18 14:49:16 -07: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 Squashed commit of the following: 2014-05-18 14:49:16 -07:00