From f191c72732d466921078ab94aba2ec854fdc72d6 Mon Sep 17 00:00:00 2001 From: pipu Date: Thu, 12 Jun 2014 16:27:45 +0800 Subject: [PATCH] add TimeLineAction into project --- build/cocos2d_libs.xcodeproj/project.pbxproj | 80 +++++++++++++++++++ build/cocos2d_tests.xcodeproj/project.pbxproj | 22 +++++ 2 files changed, 102 insertions(+) diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj b/build/cocos2d_libs.xcodeproj/project.pbxproj index 8f3879fe78..a1bf7062ee 100644 --- a/build/cocos2d_libs.xcodeproj/project.pbxproj +++ b/build/cocos2d_libs.xcodeproj/project.pbxproj @@ -995,6 +995,30 @@ 2AC795EA1862875D005EC8E1 /* BoundingBoxAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795D418628672005EC8E1 /* BoundingBoxAttachment.h */; }; 373B9129187891F400198F86 /* CCComBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 373B910718787C0B00198F86 /* CCComBase.h */; }; 373B912A187891FB00198F86 /* CCComBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 373B910718787C0B00198F86 /* CCComBase.h */; }; + 38FA2E0D1949569800FF2BE4 /* CCAsyncReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E011949569800FF2BE4 /* CCAsyncReader.cpp */; }; + 38FA2E0E1949569800FF2BE4 /* CCAsyncReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E011949569800FF2BE4 /* CCAsyncReader.cpp */; }; + 38FA2E0F1949569800FF2BE4 /* CCAsyncReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E021949569800FF2BE4 /* CCAsyncReader.h */; }; + 38FA2E101949569800FF2BE4 /* CCAsyncReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E021949569800FF2BE4 /* CCAsyncReader.h */; }; + 38FA2E111949569800FF2BE4 /* CCFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E031949569800FF2BE4 /* CCFrame.cpp */; }; + 38FA2E121949569800FF2BE4 /* CCFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E031949569800FF2BE4 /* CCFrame.cpp */; }; + 38FA2E131949569800FF2BE4 /* CCFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E041949569800FF2BE4 /* CCFrame.h */; }; + 38FA2E141949569800FF2BE4 /* CCFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E041949569800FF2BE4 /* CCFrame.h */; }; + 38FA2E151949569800FF2BE4 /* CCNodeCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E051949569800FF2BE4 /* CCNodeCache.cpp */; }; + 38FA2E161949569800FF2BE4 /* CCNodeCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E051949569800FF2BE4 /* CCNodeCache.cpp */; }; + 38FA2E171949569800FF2BE4 /* CCNodeCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E061949569800FF2BE4 /* CCNodeCache.h */; }; + 38FA2E181949569800FF2BE4 /* CCNodeCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E061949569800FF2BE4 /* CCNodeCache.h */; }; + 38FA2E191949569800FF2BE4 /* CCTimeLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E071949569800FF2BE4 /* CCTimeLine.cpp */; }; + 38FA2E1A1949569800FF2BE4 /* CCTimeLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E071949569800FF2BE4 /* CCTimeLine.cpp */; }; + 38FA2E1B1949569800FF2BE4 /* CCTimeLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E081949569800FF2BE4 /* CCTimeLine.h */; }; + 38FA2E1C1949569800FF2BE4 /* CCTimeLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E081949569800FF2BE4 /* CCTimeLine.h */; }; + 38FA2E1D1949569800FF2BE4 /* CCTimelineAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E091949569800FF2BE4 /* CCTimelineAction.cpp */; }; + 38FA2E1E1949569800FF2BE4 /* CCTimelineAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E091949569800FF2BE4 /* CCTimelineAction.cpp */; }; + 38FA2E1F1949569800FF2BE4 /* CCTimelineAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E0A1949569800FF2BE4 /* CCTimelineAction.h */; }; + 38FA2E201949569800FF2BE4 /* CCTimelineAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E0A1949569800FF2BE4 /* CCTimelineAction.h */; }; + 38FA2E211949569800FF2BE4 /* CCTimelineActionCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E0B1949569800FF2BE4 /* CCTimelineActionCache.cpp */; }; + 38FA2E221949569800FF2BE4 /* CCTimelineActionCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E0B1949569800FF2BE4 /* CCTimelineActionCache.cpp */; }; + 38FA2E231949569800FF2BE4 /* CCTimelineActionCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E0C1949569800FF2BE4 /* CCTimelineActionCache.h */; }; + 38FA2E241949569800FF2BE4 /* CCTimelineActionCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 38FA2E0C1949569800FF2BE4 /* CCTimelineActionCache.h */; }; 3EA0FB6B191C841D00B170C8 /* UIVideoPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA0FB69191C841D00B170C8 /* UIVideoPlayer.h */; }; 3EA0FB6C191C841D00B170C8 /* UIVideoPlayerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3EA0FB6A191C841D00B170C8 /* UIVideoPlayerIOS.mm */; }; 460E468118080832000CDD6D /* cocos-ext.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A167D21807AF4D005B8026 /* cocos-ext.h */; }; @@ -2275,6 +2299,18 @@ 37936A3C1869B76800E974DD /* reader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = reader.h; sourceTree = ""; }; 37936A3D1869B76800E974DD /* stringbuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stringbuffer.h; sourceTree = ""; }; 37936A3E1869B76800E974DD /* writer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = writer.h; sourceTree = ""; }; + 38FA2E011949569800FF2BE4 /* CCAsyncReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCAsyncReader.cpp; sourceTree = ""; }; + 38FA2E021949569800FF2BE4 /* CCAsyncReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCAsyncReader.h; sourceTree = ""; }; + 38FA2E031949569800FF2BE4 /* CCFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCFrame.cpp; sourceTree = ""; }; + 38FA2E041949569800FF2BE4 /* CCFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCFrame.h; sourceTree = ""; }; + 38FA2E051949569800FF2BE4 /* CCNodeCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCNodeCache.cpp; sourceTree = ""; }; + 38FA2E061949569800FF2BE4 /* CCNodeCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCNodeCache.h; sourceTree = ""; }; + 38FA2E071949569800FF2BE4 /* CCTimeLine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCTimeLine.cpp; sourceTree = ""; }; + 38FA2E081949569800FF2BE4 /* CCTimeLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTimeLine.h; sourceTree = ""; }; + 38FA2E091949569800FF2BE4 /* CCTimelineAction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCTimelineAction.cpp; sourceTree = ""; }; + 38FA2E0A1949569800FF2BE4 /* CCTimelineAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTimelineAction.h; sourceTree = ""; }; + 38FA2E0B1949569800FF2BE4 /* CCTimelineActionCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCTimelineActionCache.cpp; sourceTree = ""; }; + 38FA2E0C1949569800FF2BE4 /* CCTimelineActionCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTimelineActionCache.h; sourceTree = ""; }; 3EA0FB69191C841D00B170C8 /* UIVideoPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIVideoPlayer.h; sourceTree = ""; }; 3EA0FB6A191C841D00B170C8 /* UIVideoPlayerIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UIVideoPlayerIOS.mm; sourceTree = ""; }; 46A15FCC1807A544005B8026 /* AUTHORS */ = {isa = PBXFileReference; lastKnownFileType = text; name = AUTHORS; path = ../AUTHORS; sourceTree = ""; }; @@ -3559,6 +3595,7 @@ 1A8C5946180E930E00EF57C3 /* cocostudio */ = { isa = PBXGroup; children = ( + 38FA2E001949569800FF2BE4 /* TimelineAction */, 50FCEB6818C72017004AD434 /* WidgetReader */, 06CAAAC1186AD63B0012A414 /* TriggerObj.h */, 06CAAABC186AD63B0012A414 /* TriggerBase.cpp */, @@ -4002,6 +4039,25 @@ path = internal; sourceTree = ""; }; + 38FA2E001949569800FF2BE4 /* TimelineAction */ = { + isa = PBXGroup; + children = ( + 38FA2E011949569800FF2BE4 /* CCAsyncReader.cpp */, + 38FA2E021949569800FF2BE4 /* CCAsyncReader.h */, + 38FA2E031949569800FF2BE4 /* CCFrame.cpp */, + 38FA2E041949569800FF2BE4 /* CCFrame.h */, + 38FA2E051949569800FF2BE4 /* CCNodeCache.cpp */, + 38FA2E061949569800FF2BE4 /* CCNodeCache.h */, + 38FA2E071949569800FF2BE4 /* CCTimeLine.cpp */, + 38FA2E081949569800FF2BE4 /* CCTimeLine.h */, + 38FA2E091949569800FF2BE4 /* CCTimelineAction.cpp */, + 38FA2E0A1949569800FF2BE4 /* CCTimelineAction.h */, + 38FA2E0B1949569800FF2BE4 /* CCTimelineActionCache.cpp */, + 38FA2E0C1949569800FF2BE4 /* CCTimelineActionCache.h */, + ); + path = TimelineAction; + sourceTree = ""; + }; 46A15FD01807A56F005B8026 /* audio */ = { isa = PBXGroup; children = ( @@ -4849,6 +4905,7 @@ 50ABBE8D1925AB6F00A911A9 /* CCNS.h in Headers */, 2AC795E218628723005EC8E1 /* BoundingBoxAttachment.h in Headers */, 06CAAAC9186AD7EE0012A414 /* TriggerMng.h in Headers */, + 38FA2E131949569800FF2BE4 /* CCFrame.h in Headers */, 2905FA6018CF08D100240AA3 /* UILayoutParameter.h in Headers */, 50ABBEA51925AB6F00A911A9 /* CCScriptSupport.h in Headers */, B29594D01926D61F003EEF37 /* CCSprite3DDataCache.h in Headers */, @@ -5140,16 +5197,19 @@ 50ABC00B1926664800A911A9 /* CCDevice.h in Headers */, 2905FA7A18CF08D100240AA3 /* UISlider.h in Headers */, 1A8C59AD180E930E00EF57C3 /* CCArmatureDefine.h in Headers */, + 38FA2E171949569800FF2BE4 /* CCNodeCache.h in Headers */, 50ABC0131926664800A911A9 /* CCGLViewProtocol.h in Headers */, 1A8C59B1180E930E00EF57C3 /* CCBatchNode.h in Headers */, 50ABBDB31925AB4100A911A9 /* ccShaders.h in Headers */, 2905FA5418CF08D100240AA3 /* UIImageView.h in Headers */, 1A8C59B5180E930E00EF57C3 /* CCBone.h in Headers */, 50ABBDAB1925AB4100A911A9 /* CCRenderCommandPool.h in Headers */, + 38FA2E1B1949569800FF2BE4 /* CCTimeLine.h in Headers */, 5034CA45191D591100CE6051 /* ccShader_Label_outline.frag in Headers */, 1A8C59B9180E930E00EF57C3 /* CCColliderDetector.h in Headers */, 1A8C59BD180E930E00EF57C3 /* CCComAttribute.h in Headers */, 1A8C59C1180E930E00EF57C3 /* CCComAudio.h in Headers */, + 38FA2E231949569800FF2BE4 /* CCTimelineActionCache.h in Headers */, 1A8C59C5180E930E00EF57C3 /* CCComController.h in Headers */, 1A8C59C9180E930E00EF57C3 /* CCComRender.h in Headers */, 1A8C59CD180E930E00EF57C3 /* CCDataReaderHelper.h in Headers */, @@ -5162,6 +5222,7 @@ 1A8C59D9180E930E00EF57C3 /* CCDisplayFactory.h in Headers */, 50ABC0691926664800A911A9 /* CCStdC.h in Headers */, 50ABBECD1925AB6F00A911A9 /* s3tc.h in Headers */, + 38FA2E0F1949569800FF2BE4 /* CCAsyncReader.h in Headers */, 50ABBE771925AB6F00A911A9 /* CCEventListenerTouch.h in Headers */, 1A8C59DD180E930E00EF57C3 /* CCDisplayManager.h in Headers */, 1A8C59E1180E930E00EF57C3 /* CCInputDelegate.h in Headers */, @@ -5178,6 +5239,7 @@ 1A8C59FD180E930E00EF57C3 /* CCTween.h in Headers */, 1A8C5A05180E930E00EF57C3 /* CCUtilMath.h in Headers */, 50ABC0091926664800A911A9 /* CCCommon.h in Headers */, + 38FA2E1F1949569800FF2BE4 /* CCTimelineAction.h in Headers */, 50ABBE531925AB6F00A911A9 /* CCEventDispatcher.h in Headers */, 1A8C5A07180E930E00EF57C3 /* CocoStudio.h in Headers */, 1A8C5A0F180E930E00EF57C3 /* DictionaryHelper.h in Headers */, @@ -5428,9 +5490,11 @@ 5034CA42191D591100CE6051 /* ccShader_Position_uColor.frag in Headers */, 1A5701C4180BCB5A0088DEC7 /* CCLabelBMFont.h in Headers */, 50ABBDA61925AB4100A911A9 /* CCQuadCommand.h in Headers */, + 38FA2E201949569800FF2BE4 /* CCTimelineAction.h in Headers */, 50ABBE9E1925AB6F00A911A9 /* CCRefPtr.h in Headers */, 1A01C69518F57BE800EFE3A6 /* CCFloat.h in Headers */, 1A5701CA180BCB5A0088DEC7 /* CCLabelTextFormatter.h in Headers */, + 38FA2E181949569800FF2BE4 /* CCNodeCache.h in Headers */, 2905FA7B18CF08D100240AA3 /* UISlider.h in Headers */, 5034CA22191D591100CE6051 /* ccShader_PositionTextureColorAlphaTest.frag in Headers */, 50ABBECE1925AB6F00A911A9 /* s3tc.h in Headers */, @@ -5616,6 +5680,7 @@ 1A01C69F18F57BE800EFE3A6 /* CCString.h in Headers */, 1A01C69118F57BE800EFE3A6 /* CCDictionary.h in Headers */, 1A8C598E180E930E00EF57C3 /* CCActionFrame.h in Headers */, + 38FA2E1C1949569800FF2BE4 /* CCTimeLine.h in Headers */, 1A8C5992180E930E00EF57C3 /* CCActionFrameEasing.h in Headers */, 5034CA36191D591100CE6051 /* ccShader_PositionTexture.frag in Headers */, 1A8C5996180E930E00EF57C3 /* CCActionManagerEx.h in Headers */, @@ -5624,6 +5689,7 @@ 1A8C599E180E930E00EF57C3 /* CCActionObject.h in Headers */, 1A8C59A2180E930E00EF57C3 /* CCArmature.h in Headers */, 1A8C59A6180E930E00EF57C3 /* CCArmatureAnimation.h in Headers */, + 38FA2E101949569800FF2BE4 /* CCAsyncReader.h in Headers */, 2905FA8718CF08D100240AA3 /* UITextBMFont.h in Headers */, 1A8C59AA180E930E00EF57C3 /* CCArmatureDataManager.h in Headers */, 1A8C59AE180E930E00EF57C3 /* CCArmatureDefine.h in Headers */, @@ -5670,9 +5736,11 @@ 50FCEBA218C72017004AD434 /* LayoutReader.h in Headers */, 1A8C59F2180E930E00EF57C3 /* CCSpriteFrameCacheHelper.h in Headers */, 1A8C59F6180E930E00EF57C3 /* CCSSceneReader.h in Headers */, + 38FA2E241949569800FF2BE4 /* CCTimelineActionCache.h in Headers */, 1A8C59FA180E930E00EF57C3 /* CCTransformHelp.h in Headers */, 50ABBDAA1925AB4100A911A9 /* CCRenderCommand.h in Headers */, 1A8C59FE180E930E00EF57C3 /* CCTween.h in Headers */, + 38FA2E141949569800FF2BE4 /* CCFrame.h in Headers */, 1A8C5A06180E930E00EF57C3 /* CCUtilMath.h in Headers */, 50ABBE601925AB6F00A911A9 /* CCEventListener.h in Headers */, 1A8C5A08180E930E00EF57C3 /* CocoStudio.h in Headers */, @@ -6047,6 +6115,7 @@ 46A170EA1807CECA005B8026 /* CCPhysicsJoint.cpp in Sources */, 5027253C190BF1B900AAF4ED /* cocos2d.cpp in Sources */, 50ABC0611926664800A911A9 /* CCCommon.mm in Sources */, + 38FA2E1D1949569800FF2BE4 /* CCTimelineAction.cpp in Sources */, 50ABBDB11925AB4100A911A9 /* ccShaders.cpp in Sources */, 46A170EF1807CECA005B8026 /* CCPhysicsWorld.cpp in Sources */, 46A170ED1807CECA005B8026 /* CCPhysicsShape.cpp in Sources */, @@ -6157,6 +6226,7 @@ B29594C21926D61F003EEF37 /* CCMesh.cpp in Sources */, 50ABBE3D1925AB6F00A911A9 /* CCDataVisitor.cpp in Sources */, 1A5702C8180BCE370088DEC7 /* CCTextFieldTTF.cpp in Sources */, + 38FA2E211949569800FF2BE4 /* CCTimelineActionCache.cpp in Sources */, 50ABBE7D1925AB6F00A911A9 /* CCEventTouch.cpp in Sources */, 50FCEBAB18C72017004AD434 /* PageViewReader.cpp in Sources */, 1A5702EA180BCE750088DEC7 /* CCTileMapAtlas.cpp in Sources */, @@ -6165,6 +6235,7 @@ 50ABBE691925AB6F00A911A9 /* CCEventListenerFocus.cpp in Sources */, 1A5702F2180BCE750088DEC7 /* CCTMXObjectGroup.cpp in Sources */, 1A5702F6180BCE750088DEC7 /* CCTMXTiledMap.cpp in Sources */, + 38FA2E191949569800FF2BE4 /* CCTimeLine.cpp in Sources */, 1A5702FA180BCE750088DEC7 /* CCTMXXMLParser.cpp in Sources */, 50ABBD5C1925AB0000A911A9 /* Vec3.cpp in Sources */, 1A570300180BCE890088DEC7 /* CCParallaxNode.cpp in Sources */, @@ -6206,6 +6277,7 @@ 2905FA6A18CF08D100240AA3 /* UIPageView.cpp in Sources */, B29594C61926D61F003EEF37 /* CCObjLoader.cpp in Sources */, 06CAAAC7186AD7E90012A414 /* TriggerObj.cpp in Sources */, + 38FA2E151949569800FF2BE4 /* CCNodeCache.cpp in Sources */, 1AD71DEF180E26E600808F54 /* CCNode+CCBRelativePositioning.cpp in Sources */, 50ABC01D1926664800A911A9 /* CCThread.cpp in Sources */, 1AD71DF3180E26E600808F54 /* CCNodeLoader.cpp in Sources */, @@ -6243,6 +6315,7 @@ 50E6D33818E174130051CA34 /* UIRelativeBox.cpp in Sources */, 1AD71ECD180E26E600808F54 /* Skeleton.cpp in Sources */, 1AD71ED1180E26E600808F54 /* SkeletonData.cpp in Sources */, + 38FA2E0D1949569800FF2BE4 /* CCAsyncReader.cpp in Sources */, 1AD71ED5180E26E600808F54 /* SkeletonJson.cpp in Sources */, B29594CA1926D61F003EEF37 /* CCSprite3D.cpp in Sources */, 1AD71ED9180E26E600808F54 /* Skin.cpp in Sources */, @@ -6251,6 +6324,7 @@ 2905FA7818CF08D100240AA3 /* UISlider.cpp in Sources */, 1AD71EE5180E26E600808F54 /* spine-cocos2dx.cpp in Sources */, 1AAF536A180E3374000584C8 /* HttpClient.cpp in Sources */, + 38FA2E111949569800FF2BE4 /* CCFrame.cpp in Sources */, 50ABC0631926664800A911A9 /* CCDevice.mm in Sources */, 1AAF5372180E3374000584C8 /* SocketIO.cpp in Sources */, 50ABBE1F1925AB6F00A911A9 /* atitc.cpp in Sources */, @@ -6523,6 +6597,7 @@ 50ABBE421925AB6F00A911A9 /* CCDirector.cpp in Sources */, 1A57007E180BC5A10088DEC7 /* CCActionInterval.cpp in Sources */, 1A570082180BC5A10088DEC7 /* CCActionManager.cpp in Sources */, + 38FA2E221949569800FF2BE4 /* CCTimelineActionCache.cpp in Sources */, 1A570086180BC5A10088DEC7 /* CCActionPageTurn3D.cpp in Sources */, 1A57008A180BC5A10088DEC7 /* CCActionProgressTimer.cpp in Sources */, B29594CB1926D61F003EEF37 /* CCSprite3D.cpp in Sources */, @@ -6533,6 +6608,8 @@ 1A570099180BC5C10088DEC7 /* CCAtlasNode.cpp in Sources */, 50ABBD4D1925AB0000A911A9 /* MathUtil.cpp in Sources */, 50ABBE3E1925AB6F00A911A9 /* CCDataVisitor.cpp in Sources */, + 38FA2E1E1949569800FF2BE4 /* CCTimelineAction.cpp in Sources */, + 38FA2E121949569800FF2BE4 /* CCFrame.cpp in Sources */, 1A57009F180BC5D20088DEC7 /* CCNode.cpp in Sources */, B37510831823ACA100B3BA6A /* CCPhysicsShapeInfo_chipmunk.cpp in Sources */, B29594CF1926D61F003EEF37 /* CCSprite3DDataCache.cpp in Sources */, @@ -6680,6 +6757,7 @@ 50ABBD391925AB0000A911A9 /* CCAffineTransform.cpp in Sources */, 50ABBD841925AB4100A911A9 /* CCBatchCommand.cpp in Sources */, 1AD71EC2180E26E600808F54 /* extension.cpp in Sources */, + 38FA2E1A1949569800FF2BE4 /* CCTimeLine.cpp in Sources */, 1AD71EC6180E26E600808F54 /* Json.cpp in Sources */, 1AD71ECA180E26E600808F54 /* RegionAttachment.cpp in Sources */, 1AD71ECE180E26E600808F54 /* Skeleton.cpp in Sources */, @@ -6756,10 +6834,12 @@ 1A8C59EC180E930E00EF57C3 /* CCSkin.cpp in Sources */, 2905FA4718CF08D100240AA3 /* UIButton.cpp in Sources */, 1A8C59F0180E930E00EF57C3 /* CCSpriteFrameCacheHelper.cpp in Sources */, + 38FA2E161949569800FF2BE4 /* CCNodeCache.cpp in Sources */, 50ABBEB41925AB6F00A911A9 /* CCUserDefault.mm in Sources */, 1A1645B1191B726C008C7C7F /* ConvertUTF.c in Sources */, 1A8C59F4180E930E00EF57C3 /* CCSSceneReader.cpp in Sources */, 1A8C59F8180E930E00EF57C3 /* CCTransformHelp.cpp in Sources */, + 38FA2E0E1949569800FF2BE4 /* CCAsyncReader.cpp in Sources */, 50ABBE3A1925AB6F00A911A9 /* CCData.cpp in Sources */, 1A8C59FC180E930E00EF57C3 /* CCTween.cpp in Sources */, 2905FA5318CF08D100240AA3 /* UIImageView.cpp in Sources */, diff --git a/build/cocos2d_tests.xcodeproj/project.pbxproj b/build/cocos2d_tests.xcodeproj/project.pbxproj index 856c5e741d..6d8ff80b41 100644 --- a/build/cocos2d_tests.xcodeproj/project.pbxproj +++ b/build/cocos2d_tests.xcodeproj/project.pbxproj @@ -804,6 +804,10 @@ 29080DE4191B595E0066F8DF /* UIWidgetAddNodeTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D89191B595E0066F8DF /* UIWidgetAddNodeTest.cpp */; }; 29080DE5191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D8B191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.cpp */; }; 29080DE6191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D8B191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.cpp */; }; + 38FA2DFC194955BA00FF2BE4 /* TimelineActionTestScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2DFA194955BA00FF2BE4 /* TimelineActionTestScene.cpp */; }; + 38FA2DFD194955BA00FF2BE4 /* TimelineActionTestScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2DFA194955BA00FF2BE4 /* TimelineActionTestScene.cpp */; }; + 38FA2E261949577F00FF2BE4 /* TimelineAction in Resources */ = {isa = PBXBuildFile; fileRef = 38FA2E251949577F00FF2BE4 /* TimelineAction */; }; + 38FA2E271949577F00FF2BE4 /* TimelineAction in Resources */ = {isa = PBXBuildFile; fileRef = 38FA2E251949577F00FF2BE4 /* TimelineAction */; }; 3E92EA821921A1400094CD21 /* Sprite3DTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E92EA801921A1400094CD21 /* Sprite3DTest.cpp */; }; 3E92EA831921A1400094CD21 /* Sprite3DTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E92EA801921A1400094CD21 /* Sprite3DTest.cpp */; }; 3E92EA851921A7720094CD21 /* Sprite3DTest in Resources */ = {isa = PBXBuildFile; fileRef = 3E92EA841921A7720094CD21 /* Sprite3DTest */; }; @@ -1840,6 +1844,9 @@ 29080D8A191B595E0066F8DF /* UIWidgetAddNodeTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIWidgetAddNodeTest.h; sourceTree = ""; }; 29080D8B191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIWidgetAddNodeTest_Editor.cpp; sourceTree = ""; }; 29080D8C191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIWidgetAddNodeTest_Editor.h; sourceTree = ""; }; + 38FA2DFA194955BA00FF2BE4 /* TimelineActionTestScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TimelineActionTestScene.cpp; sourceTree = ""; }; + 38FA2DFB194955BA00FF2BE4 /* TimelineActionTestScene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimelineActionTestScene.h; sourceTree = ""; }; + 38FA2E251949577F00FF2BE4 /* TimelineAction */ = {isa = PBXFileReference; lastKnownFileType = folder; name = TimelineAction; path = "../tests/cpp-tests/Resources/TimelineAction"; sourceTree = ""; }; 3E92EA801921A1400094CD21 /* Sprite3DTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Sprite3DTest.cpp; path = Sprite3DTest/Sprite3DTest.cpp; sourceTree = ""; }; 3E92EA811921A1400094CD21 /* Sprite3DTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Sprite3DTest.h; path = Sprite3DTest/Sprite3DTest.h; sourceTree = ""; }; 3E92EA841921A7720094CD21 /* Sprite3DTest */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Sprite3DTest; path = "../tests/cpp-tests/Resources/Sprite3DTest"; sourceTree = ""; }; @@ -2541,6 +2548,7 @@ 1AC359B418CECF0B00F37B72 /* ExtensionsTest */ = { isa = PBXGroup; children = ( + 38FA2DF9194955BA00FF2BE4 /* CocoStudioTimelineActionTest */, 1AC359B518CECF0B00F37B72 /* CocosBuilderTest */, 1AC359DC18CECF0B00F37B72 /* CocoStudioArmatureTest */, 1AC359DF18CECF0B00F37B72 /* CocoStudioComponentsTest */, @@ -3240,6 +3248,7 @@ 1AC35CA818CED83500F37B72 /* Resources */ = { isa = PBXGroup; children = ( + 38FA2E251949577F00FF2BE4 /* TimelineAction */, B2507B6A192589AF00FA4972 /* Shaders3D */, 3E92EA841921A7720094CD21 /* Sprite3DTest */, 3EA0FB5D191B92F100B170C8 /* cocosvideo.mp4 */, @@ -3757,6 +3766,15 @@ name = Frameworks; sourceTree = ""; }; + 38FA2DF9194955BA00FF2BE4 /* CocoStudioTimelineActionTest */ = { + isa = PBXGroup; + children = ( + 38FA2DFA194955BA00FF2BE4 /* TimelineActionTestScene.cpp */, + 38FA2DFB194955BA00FF2BE4 /* TimelineActionTestScene.h */, + ); + path = CocoStudioTimelineActionTest; + sourceTree = ""; + }; 3E92EA7D1921A0C60094CD21 /* Sprite3DTest */ = { isa = PBXGroup; children = ( @@ -4386,6 +4404,7 @@ 1AC35D0418CED84500F37B72 /* Shaders in Resources */, 1AC35CD818CED84500F37B72 /* CocosBuilderExample.ccbresourcelog in Resources */, B2507B6B192589AF00FA4972 /* Shaders3D in Resources */, + 38FA2E261949577F00FF2BE4 /* TimelineAction in Resources */, 1AC35D0618CED84500F37B72 /* spine in Resources */, 1AC35CE818CED84500F37B72 /* extensions in Resources */, 1AC35CDE18CED84500F37B72 /* components in Resources */, @@ -4426,6 +4445,7 @@ 1AC35CE318CED84500F37B72 /* effect1.raw in Resources */, 1A221C9D191771E400FD2BE4 /* ccs-res in Resources */, 1AC35C9018CECF1400F37B72 /* Icon-29.png in Resources */, + 38FA2E271949577F00FF2BE4 /* TimelineAction in Resources */, 1AC35D0918CED84500F37B72 /* TileMaps in Resources */, 1AC35CFF18CED84500F37B72 /* Particles in Resources */, 1AC35C8818CECF1400F37B72 /* Default-568h@2x.png in Resources */, @@ -4662,6 +4682,7 @@ 1AC35B3318CECF0C00F37B72 /* Test.cpp in Sources */, 1AC35C2318CECF0C00F37B72 /* ParticleTest.cpp in Sources */, 1AC35C6118CECF0C00F37B72 /* TouchesTest.cpp in Sources */, + 38FA2DFC194955BA00FF2BE4 /* TimelineActionTestScene.cpp in Sources */, 1AC35C6318CECF0C00F37B72 /* TransitionsTest.cpp in Sources */, 29080DB3191B595E0066F8DF /* UILayoutTest_Editor.cpp in Sources */, 29080DB9191B595E0066F8DF /* UILoadingBarTest.cpp in Sources */, @@ -4779,6 +4800,7 @@ 1AC35C1818CECF0C00F37B72 /* MotionStreakTest.cpp in Sources */, 1AC35C0618CECF0C00F37B72 /* FontTest.cpp in Sources */, 1AC35C3818CECF0C00F37B72 /* PerformanceTest.cpp in Sources */, + 38FA2DFD194955BA00FF2BE4 /* TimelineActionTestScene.cpp in Sources */, 1F33635018E37E840074764D /* RefPtrTest.cpp in Sources */, 1AC35B2818CECF0C00F37B72 /* ActionsTest.cpp in Sources */, 1AC35C4A18CECF0C00F37B72 /* ShaderTest.cpp in Sources */,