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
Ricardo Quesada 0f67247325 Squashed commit of the following: 
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 14:33:49 2014 -0700

    Yeah... everything compiles on win32 and wp8

commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 13:58:38 2014 -0700

    CCIME moved to base

    and compiles on Android

commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 13:02:57 2014 -0700

    compiles Ok for Windows Phone 8

commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 12:25:31 2014 -0700

    fixes for Windows Phone 8

commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 11:15:13 2014 -0700

    Compiles on Win32

commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 10:08:31 2014 -0700

    Compiles on linux!

commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 09:30:42 2014 -0700

    moves cocos/2d/platform -> cocos/platform

commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 08:24:41 2014 -0700

    Merge remote-tracking branch 'cocos2d/v3' into files

commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu May 15 19:36:23 2014 -0700

    files in the correct directory
 		2014-05-16 14:36:00 -07: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 Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCGLProgram.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCGLProgramCache.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCGLProgramCache.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCGLProgramState.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCGLProgramState.h Squashed commit of the following: 2014-05-16 14:36:00 -07: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
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-16 14:36:00 -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-14 10:07:09 -07:00
CCRenderer.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCTexture2D.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07: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 Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCTextureCache.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CMakeLists.txt Squashed commit of the following: 2014-05-16 14:36:00 -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_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 Shader files use STRINGIFY 2014-05-09 16:45:42 -07:00
ccShaders.h moves shaders files from 2d/ to renderer/ 2014-05-08 18:01:48 -07:00