18 Commits

Author	SHA1	Message	Date
zilongshanren	be7c8c7553	Merge pull request #14888 from xiaofeng11/v3_actiontimeline ... Fix when add two ActionTimeLine object in one node, play state is wrong	2016-01-21 15:35:30 +08:00
James Chen	e7ed79f655	const Data -> const Data& for function argument, performance improvement.	2016-01-15 00:55:10 +08:00
XiaoFeng	0f3cb16efd	Fix when add two ActionTimeLine object in one node, play state is wrong	2016-01-14 16:16:37 +08:00
XiaoFeng	72d21ff810	Update reader, add BlendFrame supporting to Skeleton Animation ... Update json parser to prepare compatible for both current version output json description file and future optimized version json description file.	2015-08-17 13:05:29 +08:00
XiaoFeng	f410fcd737	Fix issue https://github.com/cocos2d/cocos2d-x/issues/12968	2015-07-27 11:55:18 +08:00
zhangcheng	1c983f1f39	GBKToUTF8	2015-06-17 13:16:06 +08:00
pipu	80ad7bbee8	Animation easing.	2015-04-09 16:55:15 +08:00
pipu	c0a662ff13	Modify bug that parses AnchorPointFrame.	2015-01-22 11:20:01 +08:00
pipu	78b32332d3	Parse InnerActionFrame, AlphaFrame, modify cocostudio editor version number.	2015-01-12 10:55:15 +08:00
Vladimir Timofeev	be01bede63	Fix couple of warnings. Make forward declarations to match to real declarations.	2014-12-14 21:04:14 +03:00
pipu	c3365a4654	Add interface that create node with flat buffers object for simulator	2014-12-08 14:32:33 +08:00
pipu	584c7dc7c6	Delete that use protocol buffers	2014-12-01 12:46:29 +08:00
pipu	f3cb80d8f6	Add flat buffers reader and serialize	2014-11-21 15:15:38 +08:00
pipu	752eb839c7	Add protocolbuf.a	2014-10-09 18:28:09 +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	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