6 Commits

Author	SHA1	Message	Date
Ricardo Quesada	81b06f06a9	Merge branch 'develop' into newRenderer ... Conflicts: cocos/2d/CCAtlasNode.h	2013-12-05 22:24:41 -08:00
Ricardo Quesada	e699a3b765	Uses MV in Quad Command	2013-12-05 19:04:01 -08:00
bmanGH	f540131320	add setUniformLocationWithMatrix2fv, setUniformLocationWithMatrix3fv mothed in GLProgram class.	2013-11-12 18:59:37 +08:00
Ricardo Quesada	17af5b6850	Adds flags in GLProgram to prevent sending uneeded uniforms	2013-10-31 17:56:15 -07:00
minggo	95acb1b9e3	issue #2905: helloworld build ok on android	2013-10-14 14:01:00 +08:00
minggo	49d7bbd600	issue #2905: remove sub folders except platform	2013-10-12 15:41:45 +08:00