62 Commits

Author	SHA1	Message	Date
pandamicro	600568fdba	Migrate test case from #10692 @babcca	2015-07-12 11:33:22 +08:00
yangxiao	2391558c96	add physics3d support	2015-05-08 15:49:33 +08:00
XiaoYang	5ed65e13c9	Merge pull request #303 from zhukaixy/texturecube ... bugfix for cubemap	2015-04-14 14:25:35 +08:00
zhukaixy	451a560200	bugfix for cubemap	2015-04-14 14:20:31 +08:00
yangxiao	8c8058a9be	merge cocos resolve conflict	2015-04-14 13:56:05 +08:00
zhukaixy	6684491249	1: update cube texture for sky box ... 2: add mouse-controled camera for test case (skybox)	2015-04-14 01:39:23 +08:00
minggo	59441adc2c	Merge pull request #11213 from super626/texturecube ... Texturecube bug fix	2015-03-30 10:48:10 +08:00
zhukaixy	8a1637e3de	Update cube_map.frag	2015-03-27 16:50:59 +08:00
yangxiao	a45f0d1a76	merge cocos	2015-03-27 16:50:40 +08:00
yangxiao	84535feb0c	merge cocos	2015-03-26 11:59:26 +08:00
lvlong	f93dffdeb0	node frame animation test and resource	2015-03-26 09:25:37 +08:00
zhukaixy	f3536056d8	Simpilify skybox	2015-01-29 19:01:10 +08:00
zhukaixy	ee99700ec1	add test case TextureCube	2015-01-29 09:28:14 +08:00
yangxiao	5e1d7449f7	complete use case 1	2015-01-26 14:58:16 +08:00
songmiao	dfa6137ce9	modify arcball and fog shader	2015-01-07 17:58:10 +08:00
songmiao	41cd946e27	modify fog shader format and notes	2015-01-07 15:47:27 +08:00
songmiao	c522a72f66	modify fog shader for ios device	2015-01-07 14:56:34 +08:00
songmiao	d1845f89fe	add fog test and arcball camera test	2015-01-07 11:47:34 +08:00
Thomas Hou	cfa9f039ec	change light direct for good look.	2014-12-29 16:43:48 +08:00
yangxiao	7a332aef04	ios work	2014-12-22 14:17:48 +08:00
tangziwen	95bcfaaa3e	update test 15:29	2014-12-19 15:31:06 +08:00
tangziwen	086bca399f	add three samples -- toonshader fakeshadow lightmap	2014-12-18 16:09:29 +08:00
tangziwen	3381400eec	trim uv_test texture's size	2014-11-13 12:06:52 +08:00
tangziwen	85f0b0ec29	fix resource miss	2014-11-12 17:44:19 +08:00
lvlong	bdf10426e2	new axe.c3b (ver 0.4)	2014-10-27 16:12:15 +08:00
yangxiao	fd35d43510	remove unused resource	2014-09-26 15:57:18 +08:00
yangxiao	56313aa895	merge cocos	2014-09-25 11:05:02 +08:00
yangxiao	06c0adcf6d	remove unused resource	2014-09-19 14:52:25 +08:00
yangxiao	74f98b36d6	merge cocos	2014-08-28 09:22:57 +08:00
yangxiao	03390a4f46	merge cocos	2014-08-26 14:05:59 +08:00
yangxiao	dd93439c4b	replace model	2014-08-25 19:25:51 +08:00
songchengjiang	00085c157f	Added skeleton Model ... Light On/Off	2014-08-25 16:32:15 +08:00
yangxiao	2d5431353a	engine adjust	2014-08-22 13:25:26 +08:00
liuliang	a27a420a91	Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3 ... Conflicts: cocos/3d/CCSprite3D.cpp	2014-08-20 11:45:48 +08:00
songchengjiang	d9bf2c2b7e	Finished Light And Test	2014-08-19 15:51:30 +08:00
songchengjiang	10afb9b9af	Finished Point Light ... Finished Directional Light Finished Spot Light	2014-08-18 17:10:07 +08:00
yangxiao	3c9483899e	camera, cameratest, drawNode3D squash	2014-08-07 15:23:31 +08:00
yangxiao	cd379ab412	add axe model	2014-07-31 11:26:27 +08:00
yangxiao	da4ba95806	SubMesh and Attachment	2014-07-29 10:49:06 +08:00
lvlong	70b9d9b9ac	delete cube_anim	2014-07-07 17:11:37 +08:00
yangxiao	4685a8654e	Animate3D transition	2014-06-27 17:02:08 +08:00
yangxiao	2a6ce26335	Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3	2014-06-27 16:36:36 +08:00
yangxiao	343ef9ae55	update sprite3d test	2014-06-27 16:36:01 +08:00
lvlong	a497cc0ed2	wrong suffix name	2014-06-27 15:53:25 +08:00
lvlong	fac17097a0	add a new model and change girl model to it	2014-06-27 11:44:44 +08:00
yangxiao	ccb39e51b2	animation3d transition not finished	2014-06-26 18:35:12 +08:00
lvlong	8cc4520deb	add boss.c3b	2014-06-25 13:22:04 +08:00
lvlong	658a955e36	modify skindata binary reading	2014-06-25 13:20:42 +08:00
lvlong	dfd68f128a	c3b file	2014-06-23 09:03:53 +08:00
Huabing.Xu	2c8c9dea01	use a small texture for sprite3D	2014-06-17 22:31:56 +08:00