102 Commits

Author	SHA1	Message	Date
minggo	44aba5b2af	Merge pull request #8185 from newnon/v3_Scale9Sprite_improvements ... Scale9Sprite improvements	2014-09-30 17:09:02 +08:00
Sergey Perepelitsa	d9204b009e	scale9Sprite without scale9enabled scale fix ... scale9Sprite crop > border tile bug fix	2014-09-30 10:59:20 +04:00
Sergey Perepelitsa	094716a500	Scale9Sprite cropped frames tests	2014-09-28 01:58:26 +04:00
yangxiao	fd35d43510	remove unused resource	2014-09-26 15:57:18 +08:00
yangxiao	567c632d98	config max support light number in shader	2014-09-25 15:29:32 +08:00
yangxiao	56313aa895	merge cocos	2014-09-25 11:05:02 +08:00
Dhilan007	ed4e800d70	Add audio resource.	2014-09-23 15:38:40 +08:00
yangxiao	06c0adcf6d	remove unused resource	2014-09-19 14:52:25 +08:00
yangxiao	3cfc36591c	merge cocos	2014-09-11 10:13:57 +08:00
yangxiao	74f98b36d6	merge cocos	2014-08-28 09:22:57 +08:00
andyque	84c5542a0e	Merge branch 'v3' into addWebView	2014-08-26 22:11:35 +08:00
andyque	9449152caf	finish WebView Tests	2014-08-26 22:03:55 +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
Huabing.Xu	a9a403013c	fix skinned outline effect	2014-08-14 10:44:03 +08:00
minggo	cc37780861	Merge pull request #7736 from dabingnn/v3_addSkinnedOutline ... V3 add skinned outline	2014-08-12 15:07:21 +08:00
Huabing.Xu	e66d1f6f69	add skinned outline effect	2014-08-11 18:11:15 +08:00
yangxiao	3c9483899e	camera, cameratest, drawNode3D squash	2014-08-07 15:23:31 +08:00
yangxiao	11a13ce9e2	Merge branch 'newcode' into v3	2014-08-04 15:41:21 +08:00
andyque	5af4657fbb	fix windows utf8 source code file can not compile erorr	2014-08-01 21:20:27 +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
Sergey	92ac809bfe	Mac fonts tests	2014-07-24 12:27:17 +04:00
geron-cn	5b7852c5f6	update ccs-res hd csbs	2014-07-10 11:17:01 +08:00
geron-cn	2a64bd8945	udpate ccs-res	2014-07-09 18:35:10 +08:00
geron-cn	cd84081c37	udpate ccs-res	2014-07-09 18:02:17 +08:00
lvlong	70b9d9b9ac	delete cube_anim	2014-07-07 17:11:37 +08:00
zhangcheng	1551854c30	revert submodule res-ccs	2014-07-02 17:00:30 +08:00
Huabing.Xu	395e61f977	fix outline bug	2014-06-30 17:21:04 +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	392a769c8f	merge cocos2d v3	2014-06-26 22:48:42 +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
andyque	808c4bd763	remove unused override method	2014-06-23 15:46:07 +08:00
lvlong	dfd68f128a	c3b file	2014-06-23 09:03:53 +08:00
minggo	0d07e19cd1	Merge pull request #7054 from 2youyouo2/v3 ... add TimelineAction	2014-06-19 21:05:15 +08:00
2youyou2	719fdb712d	add frame event test	2014-06-18 11:22:38 +08:00
Huabing.Xu	2c8c9dea01	use a small texture for sprite3D	2014-06-17 22:31:56 +08:00
lvlong	32cc5b12d6	ready	2014-06-16 19:30:45 +08:00
lvlong	4b7f6a6185	static Sprite3D is ok	2014-06-16 19:08:43 +08:00