19 Commits

Author	SHA1	Message	Date
kaile.yin	fd69a5efc3	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3	2014-12-03 15:22:46 +08:00
kaile.yin	bbd971d910	create ActionTimelineNode	2014-11-17 21:05:20 +08:00
joewanchen	c2b97a3b13	fix sprite frame cache, and remove unnecessary headers dependencies. ... we should add private headers for ccs, do not expose privae headers to users.	2014-11-07 09:13:59 +08:00
pipu	752eb839c7	Add protocolbuf.a	2014-10-09 18:28:09 +08:00
zhangcheng	6cfc5b72dc	1. CocosStudio adapt to cocos2d-x v3.2.	2014-07-21 17:45:56 +08:00
2youyou2	5bce6b87ea	change ActionTimeline to cocostudio ActionTimeline folder	2014-06-13 18:51:32 +08:00
2youyou2	2031e0e92d	change TimelineAction to ActionTimeline	2014-06-13 16:03:03 +08:00
2youyou2	e0f6ae9db4	change TimelineAction to cocos/2d folder	2014-06-13 13:36:01 +08:00
2youyou2	b2c5334de1	change NodeCache to NodeReader	2014-06-12 19:24:27 +08:00
2youyou2	f536020d26	remove unused files	2014-06-12 16:21:41 +08:00
youyou	28ae57c5fc	add AsyncReader	2014-06-12 00:38:23 +08:00
2youyou2	09a2ceb7df	add TimelineAction	2014-06-11 11:10:07 +08:00
andyque	895b2a0055	move CCActionEaseEx and CCTweenFunction to core engine	2014-02-18 14:22:12 +08:00
walzer	d4c1aa92d5	add copyrights for 2014, in folders other then 2d.	2014-01-07 11:47:11 +08:00
chengstory	b4118a7ccc	fixed #3582 ... 1. add #include "cocostudio/CCComBase.h" into CocoStudio.h	2014-01-05 03:55:10 +08:00
yinkaile	d72c9d94d7	upload trigger code.	2013-12-25 17:40:54 +08:00
zhangcheng	2c6f95ecea	issue #3456 replace jsoncpp to rapidjson.	2013-12-24 20:33:55 +08:00
minggo	8f7a489a4d	issue #2905:make cocostudio and gui flat	2013-10-16 16:48:39 +08:00
minggo	6fc2be62f5	issue #2905: testcpp bild ok on Android	2013-10-15 18:00:03 +08:00