11 Commits

Author	SHA1	Message	Date
yangxiao	84535feb0c	merge cocos	2015-03-26 11:59:26 +08:00
WenhaiLin	153d697f1a	[ci skip]Update comments.	2015-03-25 10:59:04 +08:00
zhukaixy	806a5011e5	solve the problems noted in comments	2015-01-30 17:23:30 +08:00
zhukaixy	ee99700ec1	add test case TextureCube	2015-01-29 09:28:14 +08:00
Ricardo Quesada	6f3ca63f00	Moved base/CCPlatform* -> platform/CCPlatform*	2014-09-09 17:17:07 -07:00
Ricardo Quesada	9082ca18c3	Platform fixed	2014-09-09 16:50:02 -07:00
Huabing.Xu	7fbd81aeca	add NORMAL, BLEND_WEIGHT, BLEND_INDEX flag to be correspondent to GLProgram::VertexAttrib	2014-08-05 15:15:17 +08:00
Huabing.Xu	9acf8e6253	fix bug for deleteTexture	2014-06-12 15:22:41 +08:00
Ricardo Quesada	012f1020ca	GLProgramState fixes ... It is possible to submit to the Renderer a Sprite with custom uniforms (although it won't be batched). It is possible to use a custom shader + uniforms on Sprite with subclassing Sprite	2014-05-12 19:12:56 -07:00
Ricardo Quesada	00834b1d6e	adds missing files for Windows	2014-05-09 11:28:06 -07:00
Ricardo Quesada	62d9c24518	moves shaders files from 2d/ to renderer/	2014-05-08 18:01:48 -07:00