axmol/cocos/editor-support/cocostudio
kaile.yin f01b249880 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-07-08 10:21:00 +08:00
..
ActionTimeline fixed set color to parent, it will effect its children 2014-07-08 10:13:15 +08:00
WidgetReader fix TextReader TTF font Reader issue 2014-07-07 15:22:14 +08:00
proj.win32 revert Android.mk 2014-07-04 15:39:07 +08:00
proj.wp8 fixed missing zlib.h header path 2014-07-07 10:14:57 -07:00
Android.mk fix compiling warnings 2014-07-03 11:43:56 +08:00
CCActionFrame.cpp Add new line at the end of a file to *.cpp 2014-06-19 20:45:24 +09:00
CCActionFrame.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCActionFrameEasing.cpp Add new line at the end of a file to *.cpp 2014-06-19 20:45:24 +09:00
CCActionFrameEasing.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionManagerEx.cpp 1、Update binary parse lib. 2014-07-01 16:31:17 +08:00
CCActionManagerEx.h remove Hungry style 2014-06-23 10:02:09 +08:00
CCActionNode.cpp 1、Update binary parse lib. 2014-07-01 16:31:17 +08:00
CCActionNode.h add constness to some function 2014-06-23 10:12:54 +08:00
CCActionObject.cpp 1、Update binary parse lib. 2014-07-01 16:31:17 +08:00
CCActionObject.h add constness to some function 2014-06-23 10:12:54 +08:00
CCArmature.cpp fixed armature blend func has no effect 2014-06-30 10:11:43 +08:00
CCArmature.h issue #4693: add getName(), setName() and getChildByName() 2014-06-11 16:57:43 +08:00
CCArmatureAnimation.cpp fixed crashed when remove armature in frame event. 2014-06-30 10:14:31 +08:00
CCArmatureAnimation.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCArmatureDataManager.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCArmatureDataManager.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCArmatureDefine.cpp add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
CCArmatureDefine.h removes "include "cocos2d.h" from cocos2d files 2014-01-16 21:35:58 -08:00
CCBatchNode.cpp fixed #4693: override addChild by name 2014-06-25 11:27:48 +08:00
CCBatchNode.h fixed #4693: override addChild by name 2014-06-25 11:27:48 +08:00
CCBone.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCBone.h issue #4693: add getName(), setName() and getChildByName() 2014-06-11 16:57:43 +08:00
CCColliderDetector.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCColliderDetector.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCComAttribute.cpp 1、Update binary parse lib. 2014-07-01 16:31:17 +08:00
CCComAttribute.h fix ObjectFactory refactor issue 2014-06-04 14:56:34 +08:00
CCComAudio.cpp 1、Update binary parse lib. 2014-07-01 16:31:17 +08:00
CCComAudio.h fix ObjectFactory refactor issue 2014-06-04 14:56:34 +08:00
CCComBase.h 1、Update binary parse lib. 2014-07-01 16:31:17 +08:00
CCComController.cpp fix ObjectFactory refactor issue 2014-06-04 14:56:34 +08:00
CCComController.h fix ObjectFactory refactor issue 2014-06-04 14:56:34 +08:00
CCComRender.cpp 1、Update binary parse lib. 2014-07-01 16:31:17 +08:00
CCComRender.h fix ObjectFactory refactor issue 2014-06-04 14:56:34 +08:00
CCDataReaderHelper.cpp Merge pull request #7290 from chengstory/v3_OpBinaryParse 2014-07-03 14:00:01 +08:00
CCDataReaderHelper.h fix linux compile error 2014-06-23 17:09:54 +08:00
CCDatas.cpp Merge pull request #6734 from 2youyouo2/v3 2014-05-17 12:17:34 +08:00
CCDatas.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCDecorativeDisplay.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCDecorativeDisplay.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCDisplayFactory.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCDisplayFactory.h add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
CCDisplayManager.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCDisplayManager.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCInputDelegate.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCInputDelegate.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCProcessBase.cpp change CCTweenFunction class to tweenfunc namespace 2014-02-18 14:22:13 +08:00
CCProcessBase.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCSGUIReader.cpp Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into OpBinaryParse 2014-07-01 16:36:37 +08:00
CCSGUIReader.h fix windows compile error 2014-06-23 18:29:23 +08:00
CCSSceneReader.cpp 1. fixes scene parse crash. 2014-07-02 15:58:42 +08:00
CCSSceneReader.h 1. add SceneBinary to 2.x 2014-06-25 11:58:36 +08:00
CCSkin.cpp Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCSkin.h Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCSpriteFrameCacheHelper.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCSpriteFrameCacheHelper.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCTransformHelp.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCTransformHelp.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCTween.cpp fix cross-platform comiple error 2014-02-18 14:22:15 +08:00
CCTween.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCUtilMath.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCUtilMath.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CMakeLists.txt Merge branch 'v3' into cleanupBinaryLoader 2014-06-23 09:37:39 +08:00
CocoLoader.cpp fix container default color issue 2014-07-03 14:38:45 +08:00
CocoLoader.h 1、Update binary parse lib. 2014-07-01 16:31:17 +08:00
CocoStudio.h change ActionTimeline to cocostudio ActionTimeline folder 2014-06-13 18:51:32 +08:00
DictionaryHelper.cpp Add new line at the end of a file to *.cpp 2014-06-19 20:45:24 +09:00
DictionaryHelper.h removes "include "cocos2d.h" from cocos2d files 2014-01-16 21:35:58 -08:00
TriggerBase.cpp Modify trigger 2014-03-04 23:55:36 +08:00
TriggerBase.h refact ui header file include 2014-06-04 14:56:33 +08:00
TriggerMng.cpp 1. merge v3 2014-07-02 15:37:15 +08:00
TriggerMng.h 1. add SceneBinary to 2.x 2014-06-25 11:58:36 +08:00
TriggerObj.cpp 1. merge v3 2014-07-02 15:37:15 +08:00
TriggerObj.h 1. add SceneBinary to 2.x 2014-06-25 11:58:36 +08:00