114 Commits

Author	SHA1	Message	Date
andyque	00d2bd833f	closed #4783. finish the shading effects	2014-04-14 12:03:37 +08:00
andyque	2c1f5da69c	issue #4783, add outline shader files	2014-04-14 11:52:17 +08:00
Huabing.Xu	1aa909371d	remove kmMat4 in Cpp-tests	2014-04-11 18:03:07 +08:00
Huabing.Xu	1670e07300	Merge branch 'develop' into develop_migrate_math_lib_merge ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj build/cocos2d_tests.xcodeproj/project.pbxproj	2014-04-11 11:18:13 +08:00
Huabing.Xu	d865341694	remove kmMat4 interface in cpp-tests	2014-04-10 10:16:16 +08:00
James Chen	5615717617	issue #4729: NULL -> nullptr in constructor or setXXX(NULL)	2014-04-10 00:36:43 +08:00
Huabing.Xu	3837c23ebe	draw() using Matrix instead of kmMat4	2014-04-08 22:07:35 +08:00
Huabing.Xu	e8596094a4	Merge branch 'develop' into develop_migrate_math_lib_merge	2014-04-08 16:58:51 +08:00
shujunqiao	fb777b1a1d	[ci skip], delete ShaderFail sample in ShaderTest.cpp.	2014-04-08 14:52:17 +08:00
shujunqiao	fae742c0b8	modify ShaderTest.cpp not crah to autotest.	2014-04-08 14:32:25 +08:00
Huabing.Xu	45b0ba3871	migrate Vertex2f to Vector2(tests)	2014-04-02 15:25:50 +08:00
zhangbin	95ab15195c	Optimize the performance of BlurSpriteTest in Shader Sprite.	2014-03-31 10:44:48 +08:00
zhangbin	6a1974a78a	Solve the error effect of BlurSpriteTest in Shader Sprite.	2014-03-28 20:53:14 +08:00
James Chen	b88de91a15	Renames 'samples' folder to 'tests', ouch....	2014-03-11 19:10:34 +08:00