12 Commits

Author	SHA1	Message	Date
pipu	d364a329db	Merge branch 'v3' into parse_inneractionframe	2015-01-12 14:26:05 +08:00
jianglong0156	4cc0dd129a	issue cocos2d/cocos2d-js #2563 : ActionTimelineData need to use its constructor in jsb code. So i modify the constructor to public	2015-01-12 11:57:03 +08:00
pipu	6237115fbf	Fixes bug that clone InnerActionFrame.	2015-01-12 11:09:19 +08:00
pipu	78b32332d3	Parse InnerActionFrame, AlphaFrame, modify cocostudio editor version number.	2015-01-12 10:55:15 +08:00
youyou	70052b2a3f	support animation list	2014-12-22 18:57:48 +08:00
kaile.yin	0f184a4982	add arriving last frame event	2014-10-23 17:38:04 +08:00
minggo	3679d66c8e	remove unneeded includes	2014-08-29 15:39:52 +08:00
zhangcheng	6cfc5b72dc	1. CocosStudio adapt to cocos2d-x v3.2.	2014-07-21 17:45:56 +08:00
2youyou2	b76127231c	add gotoFrameAndPlay and setCurrentFrame interface	2014-06-30 15:53:12 +08:00
2youyou2	806d74b6f9	add change play section test	2014-06-17 15:57:30 +08:00
2youyou2	d2a6782a9e	fixed start frame not right	2014-06-17 11:45:57 +08:00
2youyou2	5bce6b87ea	change ActionTimeline to cocostudio ActionTimeline folder	2014-06-13 18:51:32 +08:00