9 Commits

Author	SHA1	Message	Date
James Chen	8f6c8e202e	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1564-update-tests ... Conflicts: samples/TestCpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp	2012-11-20 16:35:42 +08:00
James Chen	ebd522e3fa	issue #1564: Return a new object instead of 'const reference' for some get methods.	2012-11-20 16:34:55 +08:00
minggo	c026a1f488	issue #1564:update ShaderTest	2012-11-20 16:16:16 +08:00
James Chen	62f7b25df2	issue #1521: Using relative coordinates in TestCpp.	2012-10-23 17:48:50 +08:00
minggo	501ceb21eb	fixed #1466:restore shader when comming to background	2012-10-18 11:00:44 +08:00
minggo	b6426f01ff	fixed #1466:restore shader when comming to background	2012-10-18 10:39:56 +08:00
minggo	bfa7991a94	fixed #1466:restore shader when comming to background	2012-10-18 10:15:46 +08:00
Walzer	cc3d850892	fixed #1416, add object orientated APIs for CCGeometry, replace "CCFloat" with "float"	2012-08-01 15:30:12 +08:00
James Chen	77f1fba566	issue #1399: Adjust folder structure, made it built successfully on win32.	2012-07-20 14:05:52 +08:00