axmol/cocos/editor-support/cocostudio
minggo abcf8f268d fix conflicts 2013-10-22 18:36:13 +08:00
..
proj.win32 issues #2905:add new vs project 2013-10-21 22:21:11 +08:00
Android.mk issue #2905:simplify Android.mk dependence 2013-10-18 14:18:36 +08:00
CCActionFrame.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCActionFrame.h issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCActionFrameEasing.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCActionFrameEasing.h issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCActionManagerEx.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCActionManagerEx.h issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCActionNode.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCActionNode.h issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCActionObject.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCActionObject.h issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCArmature.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCArmature.h issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCArmatureAnimation.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCArmatureAnimation.h Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2905-adjust_folder 2013-10-16 16:50:46 +08:00
CCArmatureDataManager.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCArmatureDataManager.h issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCArmatureDefine.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCArmatureDefine.h issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCBatchNode.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCBatchNode.h issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCBone.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCBone.h issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCColliderDetector.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCColliderDetector.h issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCComAttribute.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCComAttribute.h issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCComAudio.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCComAudio.h issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCComController.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCComController.h issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCComRender.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCComRender.h issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCDataReaderHelper.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCDataReaderHelper.h issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCDatas.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCDatas.h issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCDecorativeDisplay.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCDecorativeDisplay.h issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCDisplayFactory.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCDisplayFactory.h issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCDisplayManager.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCDisplayManager.h issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCInputDelegate.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCInputDelegate.h issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCProcessBase.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCProcessBase.h issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCSGUIReader.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCSGUIReader.h issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCSSceneReader.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCSSceneReader.h issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCSkin.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCSkin.h issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCSpriteFrameCacheHelper.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCSpriteFrameCacheHelper.h issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCTransformHelp.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCTransformHelp.h issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCTween.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCTween.h issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCTweenFunction.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCTweenFunction.h issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCUtilMath.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCUtilMath.h issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CSContentJsonDictionary.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CSContentJsonDictionary.h issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CocoStudio.h issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
DictionaryHelper.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
DictionaryHelper.h issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
Makefile issue #2905:samples build ok on linux 2013-10-22 18:01:56 +08:00