63 Commits

Author	SHA1	Message	Date
Martin Konopka	2c80b6ae3a	Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]	2015-03-15 00:10:08 +01:00
yangxiao	79a0c0152a	add 3d particle (Particle Universe)	2015-02-11 18:14:22 +08:00
Nite Luo	be6ca1b6d2	add force depth write	2015-01-27 17:05:51 -08:00
Nite Luo	4335328e3d	Add support for creating empty sprite3D	2015-01-13 16:41:24 -08:00
Nite Luo	45562f3203	optimize based on review commends	2015-01-12 22:52:20 -08:00
Nite Luo	8591609128	Implement 3D drawing support for Sprite, Label, Particle, BatchNode	2015-01-12 20:06:50 -08:00
yangxiao	1ba826ea17	modify code style	2014-12-22 17:40:02 +08:00
songchengjiang	f5f95c5693	fix errors on Windows	2014-12-19 11:30:51 +08:00
yangxiao	2a445ef1d9	correct unsuitable word	2014-12-05 16:44:49 +08:00
yangxiao	11d9f27c00	createAsync comment	2014-12-05 16:11:14 +08:00
yangxiao	c99185b755	add async load test	2014-12-05 15:01:30 +08:00
yangxiao	bc57e47ddb	add async task callback dipatcher, call it in the main thread	2014-12-04 18:31:10 +08:00
yangxiao	f17df4b0bc	add createAsync	2014-12-03 17:40:27 +08:00
yangxiao	0696041ea9	add getMeshArrayByName method	2014-10-25 12:27:03 +08:00
yangxiao	4d08a08809	add getMeshCount method	2014-10-24 15:57:47 +08:00
yangxiao	d81e4d7a92	fix light uniform array errors, and using shader without light by default fix #8612	2014-10-13 15:17:22 +08:00
Ricardo Quesada	d326db427f	removes the `3d_export.h` file	2014-10-08 18:30:23 -07:00
yangxiao	db2ff49f26	adjust according to minggo	2014-09-26 14:13:26 +08:00
yangxiao	8f3f37c2bb	auto switch shader according to light status	2014-09-25 17:13:46 +08:00
yangxiao	56313aa895	merge cocos	2014-09-25 11:05:02 +08:00
yangxiao	61def04ca6	add light mask	2014-09-22 11:14:30 +08:00
yangxiao	5b61e569f5	light mask	2014-09-19 14:50:20 +08:00
yangxiao	c5f6f8de5b	share glprogramstate	2014-09-17 13:42:08 +08:00
minggo	3679d66c8e	remove unneeded includes	2014-08-29 15:39:52 +08:00
yangxiao	39cc03173b	remove unused variable	2014-08-22 14:43:48 +08:00
yangxiao	d90572fc10	engine refactor hide concept of submesh	2014-08-22 13:52:03 +08:00
yangxiao	2d5431353a	engine adjust	2014-08-22 13:25:26 +08:00
liuliang	082689971d	Modify the model resolution	2014-08-21 11:23:31 +08:00
yangxiao	fcf4d79b06	setGLProgramState support	2014-08-20 19:01:04 +08:00
yangxiao	bd4aec4bcd	support multi-attribs	2014-08-20 18:20:19 +08:00
yangxiao	289b04a2ae	merge cocos2d	2014-08-19 13:19:42 +08:00
yangxiao	f2729c7ef2	cache work	2014-08-19 11:56:09 +08:00
yangxiao	01c1691a4f	deal aabb	2014-08-18 17:02:13 +08:00
yangxiao	30ce92f677	obj work, make code clean	2014-08-18 14:16:34 +08:00
yangxiao	cd4da73beb	merge, obj not work now	2014-08-18 11:28:57 +08:00
yangxiao	79a55286ce	refactor to new model	2014-08-18 11:13:08 +08:00
liuliang	2f816aea2c	Modified load static model	2014-08-18 10:32:23 +08:00
samuele3hu	6259aebdab	Split cocos3d from cocos2d on the android、win32 and linux platform and adjust the related test project	2014-08-17 23:45:56 +08:00
yangxiao	7159914248	old model work	2014-08-16 16:56:04 +08:00
liuliang	1b92409d78	Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3	2014-08-16 09:59:25 +08:00
liuliang	f35dd346eb	Modify Analytic	2014-08-16 09:59:08 +08:00
yangxiao	3ab7c6b952	create from bundle data	2014-08-15 20:52:45 +08:00
liuliang	0db924d7cd	Parse the data file	2014-08-15 18:20:37 +08:00
liuliang	c533f66b9f	Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3	2014-08-15 17:46:40 +08:00
liuliang	ab80c5026d	Modify the binary parsing	2014-08-15 17:45:37 +08:00
yangxiao	6f0fc48e8e	merge cocos2d	2014-08-15 16:36:17 +08:00
yangxiao	88bb1482e3	newmodel	2014-08-15 14:58:30 +08:00
yangxiao	84bb22780a	merge cocos2d	2014-08-14 17:16:20 +08:00
yangxiao	ab783d2702	merge cocos2d	2014-08-14 17:12:39 +08:00
yangxiao	6ce3b5c20a	add mirror test	2014-08-13 17:38:16 +08:00