16 Commits

Author	SHA1	Message	Date
pandamicro	a666658764	Merge pull request #12998 from pandamicro/v3.7.1 ... Add BoneNode/SkeletonNode/SkinNode JS bindings	2015-07-24 23:42:38 +08:00
pandamicro	05bb775438	Sync timelineParser and fix issue	2015-07-24 20:16:56 +08:00
VisualSj	64d247d91b	Issue #12997: Add JS test case (ccs.BoneNode)	2015-07-24 15:45:19 +08:00
geron-cn	0b09fd5bcb	Merge branch 'v3.7.1' of github.com:cocos2d/cocos2d-x into 3.7.1 ... Conflicts: cocos/2d/libcocos2d.vcxproj.filters cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.h	2015-07-24 11:38:09 +08:00
zhangcheng	4b8248c015	Optimization of Custom Data. ... replace ComExtensionData to ObjectExtensionData.	2015-07-23 16:30:23 +08:00
geron-cn	915cefa208	bone node	2015-07-23 11:51:49 +08:00
pipu	755134ba3f	Update parse animation easing	2015-04-10 17:05:55 +08:00
pipu	7a67b6ccce	Test samples	2015-04-10 14:52:54 +08:00
pipu	0bdfe99731	Update resources of Test TestTimelineProjectNode.	2015-03-20 17:08:15 +08:00
geron-cn	3268dbc9fd	add cpp-test for animation list and projected	2015-01-28 02:12:09 +08:00
yusheng.lu	304f28a58a	Update the csb resources for current Cocos2d-x	2015-01-21 17:08:16 +08:00
pipu	82be4701b5	Update resource DemoPlayer.csb in path tests/cpp-tests/Resources/ActionTimeline	2015-01-12 11:12:38 +08:00
pipu	06a0026632	Update ActionTimelineTestScene	2014-12-02 16:00:30 +08:00
pipu	ee624e47cc	1. Modifying UIScale9Sprite ... 2. Updating UI Test 3. Updatding resource of ActionTimeline	2014-10-10 10:44:16 +08:00
2youyou2	719fdb712d	add frame event test	2014-06-18 11:22:38 +08:00
2youyou2	2031e0e92d	change TimelineAction to ActionTimeline	2014-06-13 16:03:03 +08:00