174 Commits

Author	SHA1	Message	Date
yangxiao	a45f0d1a76	merge cocos	2015-03-27 16:50:40 +08:00
yangxiao	c23746fbcd	modify	2015-03-26 13:05:42 +08:00
yangxiao	000e34c6d0	merge cocos	2015-03-26 12:50:18 +08:00
yangxiao	84535feb0c	merge cocos	2015-03-26 11:59:26 +08:00
yangxiao	8d24ea7efe	rename to nodeanimation	2015-03-26 10:20:28 +08:00
yangxiao	90e010aec8	add light	2015-03-26 10:09:12 +08:00
zhukaixy	572ede87f2	correct for code indent	2015-03-26 10:05:43 +08:00
zhukaixy	aead9e5855	correct for code indent	2015-03-26 09:53:41 +08:00
lvlong	f93dffdeb0	node frame animation test and resource	2015-03-26 09:25:37 +08:00
lvlong	ecfd66cda3	node frame code!!!!!	2015-03-26 09:12:05 +08:00
zhukaixy	54472497a4	fix comments	2015-03-25 13:43:55 +08:00
zhukaixy	2ebc854335	Modify code style	2015-03-25 11:36:11 +08:00
zhukaixy	6eaa78d1cb	add reload mechanism for TextureCube and Skybox	2015-03-24 15:43:59 +08:00
tangziwen	e213cd1747	fix UVAnimation test while switching back to foreground	2015-03-23 10:19:00 +08:00
Nite Luo	cfa1f0c84f	Merge pull request #10843 from konopka/fix_compiler_reorder_warnings ... Get rid of compiler warnings: field '_xxx' will be initialized after field '_yyy'...	2015-03-13 21:12:35 -07:00
songchengjiang	7026b89b02	fix the bug of moveTo	2015-03-13 11:35:58 +08:00
Martin Konopka	350b81501d	Get rid of warnings: field '_xxx' will be initialized after field '_yyy' [-Wreorder] ... Initialization follows the order of declaration, not the order of the initialization list.	2015-03-12 23:47:58 +01:00
yangxiao	437a59fb9a	modify project & unproject api	2015-02-27 10:01:57 +08:00
yangxiao	f13237c013	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3	2015-02-26 17:27:42 +08:00
yangxiao	9a64eb18dd	add project function	2015-02-26 15:20:20 +08:00
zhukaixy	f3536056d8	Simpilify skybox	2015-01-29 19:01:10 +08:00
Nite Luo	5532cb30b6	Tweak the name	2015-01-29 00:24:32 -08:00
Nite Luo	995b7225dd	Add test-case for force depth bug	2015-01-29 00:21:33 -08:00
zhukaixy	ee99700ec1	add test case TextureCube	2015-01-29 09:28:14 +08:00
Nite Luo	5c32b31d6e	Fix test case #10237	2015-01-27 17:24:01 -08:00
yangxiao	89f107ac08	remove unused variables	2015-01-27 15:25:40 +08:00
yangxiao	9744439048	use case 2 finished	2015-01-27 15:24:15 +08:00
yangxiao	cc18a3a955	another use case not finished	2015-01-26 18:44:30 +08:00
yangxiao	5e1d7449f7	complete use case 1	2015-01-26 14:58:16 +08:00
yangxiao	677ee473ff	3d+2d use case, not finished	2015-01-23 18:24:15 +08:00
Nite Luo	4a440e66c9	Refactor draw command	2015-01-15 14:00:49 -08:00
WenhaiLin	13b049a543	Fixed warns:truncation from double to float	2015-01-15 10:07:23 +08:00
Dale Stammen	32c14710e7	allow custom shaders for WinRT Universal App	2015-01-14 10:37:04 -08:00
minggo	301cb558ec	Merge pull request #9970 from super626/v3 ... correct wrong word	2015-01-14 11:45:48 +08:00
yangxiao	772813e810	modify wrong word	2015-01-14 09:36:22 +08:00
Nite Luo	4335328e3d	Add support for creating empty sprite3D	2015-01-13 16:41:24 -08:00
Dale Stammen	f07999e1be	enabled all sprites3d tests for winrt universal apps	2015-01-13 14:33:16 -08:00
minggo	d517831e01	Merge pull request #9699 from super626/fixandroid ... fix background/foreground switch	2014-12-30 17:07:38 +08:00
yangxiao	3377c3ee53	fix #9689	2014-12-30 11:54:53 +08:00
yangxiao	bfb577e385	fix ##9689	2014-12-30 11:48:39 +08:00
Thomas Hou	1502d32aac	use std math library M_PI instead of pi.	2014-12-29 16:24:31 +08:00
yangxiao	060c6ee0b7	add quaternion test	2014-12-29 14:36:25 +08:00
yangxiao	3d77c7535d	merge cocos	2014-12-23 10:35:35 +08:00
tangziwen	68177e41e9	update	2014-12-19 17:39:26 +08:00
tangziwen	395cf929a8	update	2014-12-19 17:22:17 +08:00
tangziwen	95bcfaaa3e	update test 15:29	2014-12-19 15:31:06 +08:00
tangziwen	1bbe9e249d	fix coding style	2014-12-19 11:22:59 +08:00
yangxiao	7137e49cd4	modify async load test fix crash	2014-12-19 10:22:42 +08:00
tangziwen	591edd8bad	update test	2014-12-19 09:05:53 +08:00
tangziwen	086bca399f	add three samples -- toonshader fakeshadow lightmap	2014-12-18 16:09:29 +08:00