axmol/cocos/editor-support/cocostudio
yinkaile f0d4f3f9bf Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-26 16:19:21 +08:00
..
proj.win32 new label:add support for distanceField 2013-12-13 12:42:15 +08:00
Android.mk issue #2905:ndk-r8e build ok now 2013-10-23 17:44:20 +08:00
CCActionFrame.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCActionFrame.h Add doxygen comments for the CocoStudio 2013-11-20 12:04:47 +08:00
CCActionFrameEasing.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCActionFrameEasing.h Add doxygen comments for the CocoStudio 2013-11-20 12:04:47 +08:00
CCActionManagerEx.cpp fixed ui anmation crash when stop animation 2013-11-19 00:57:22 +08:00
CCActionManagerEx.h Add doxygen comments for the CocoStudio 2013-11-20 12:04:47 +08:00
CCActionNode.cpp Remove "_renderer" from widget 2013-12-24 20:22:14 +08:00
CCActionNode.h Add doxygen comments for the CocoStudio 2013-11-20 12:04:47 +08:00
CCActionObject.cpp fixes warning compiler 2013-12-17 11:16:30 -08:00
CCActionObject.h Add doxygen comments for the CocoStudio 2013-11-20 12:04:47 +08:00
CCArmature.cpp fixed armature update 2013-12-26 15:49:20 +08:00
CCArmature.h fixed armature update 2013-12-26 15:49:20 +08:00
CCArmatureAnimation.cpp change play interface name 2013-12-25 16:46:31 +08:00
CCArmatureAnimation.h change comment 2013-12-26 14:57:38 +08:00
CCArmatureDataManager.cpp change const char* to const std::string& 2013-12-23 14:05:46 +08:00
CCArmatureDataManager.h change std::map to std::unordered_map 2013-12-26 10:23:51 +08:00
CCArmatureDefine.cpp change armature version 2013-11-25 14:46:10 +08:00
CCArmatureDefine.h fix2d compling warning 2013-12-09 13:56:07 +08:00
CCBatchNode.cpp Merge branch 'develop' into develop_gridNode 2013-12-19 17:20:22 +08:00
CCBatchNode.h update armature to new render 2013-12-17 17:00:01 +08:00
CCBone.cpp change const char* to const std::string& 2013-12-23 14:05:46 +08:00
CCBone.h change const char* to const std::string& 2013-12-23 14:05:46 +08:00
CCColliderDetector.cpp More std::for_each —> for(const auto& …) 2013-12-20 09:54:50 +08:00
CCColliderDetector.h Merge branch 'newRenderer' into Array 2013-12-17 18:06:11 +08:00
CCComAttribute.cpp fixed #3185 support for html5. 2013-11-14 17:03:45 +08:00
CCComAttribute.h Add doxygen comments for the CocoStudio 2013-11-20 12:04:47 +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 Add doxygen comments for the CocoStudio 2013-11-20 12:04:47 +08:00
CCComRender.cpp fixed #3185 replace NULL to nullptr. 2013-11-14 14:05:24 +08:00
CCComRender.h Add doxygen comments for the CocoStudio 2013-11-20 12:04:47 +08:00
CCDataReaderHelper.cpp Don’t use FileUtils::getInstance()->getFileData, please use getStringFromFile and getDataFromFile instead. 2013-12-24 18:08:40 +08:00
CCDataReaderHelper.h fixed getFileData 2013-12-24 13:35:46 +08:00
CCDatas.cpp change const char* to const std::string& 2013-12-23 14:05:46 +08:00
CCDatas.h change const char* to const std::string& 2013-12-23 14:05:46 +08:00
CCDecorativeDisplay.cpp 1.add TEST_EASING 2013-12-06 13:40:49 +08:00
CCDecorativeDisplay.h 1.add TEST_EASING 2013-12-06 13:40:49 +08:00
CCDisplayFactory.cpp Merge branch 'newRenderer' into Array 2013-12-17 18:06:11 +08:00
CCDisplayFactory.h Add doxygen comments for the CocoStudio 2013-11-20 12:04:47 +08:00
CCDisplayManager.cpp change const char* to const std::string& 2013-12-23 14:05:46 +08:00
CCDisplayManager.h change const char* to const std::string& 2013-12-23 14:05:46 +08:00
CCInputDelegate.cpp issue #3137: Disabling Accelerometer when layer is destroyed. 2013-11-11 10:23:05 +08:00
CCInputDelegate.h Add doxygen comments for the CocoStudio 2013-11-20 15:07:34 +08:00
CCProcessBase.cpp fixed change animation internal, animation speed not right 2013-12-13 15:58:58 +08:00
CCProcessBase.h fixed change animation internal, animation speed not right 2013-12-13 15:58:58 +08:00
CCSGUIReader.cpp Remove C cast 2013-12-25 22:13:19 +08:00
CCSGUIReader.h Remove CCDictionary from GUIReader 2013-12-24 10:41:01 +08:00
CCSSceneReader.cpp Merge branch 'develop' into develop_nutty_modify_framework_newrender 2013-12-25 10:40:05 +08:00
CCSSceneReader.h Add doxygen comments for the CocoStudio 2013-11-20 12:04:47 +08:00
CCSkin.cpp change const char* to const std::string& 2013-12-23 14:05:46 +08:00
CCSkin.h change const char* to const std::string& 2013-12-23 14:05:46 +08:00
CCSpriteFrameCacheHelper.cpp change const char* to const std::string& 2013-12-23 14:05:46 +08:00
CCSpriteFrameCacheHelper.h change const char* to const std::string& 2013-12-23 14:05:46 +08:00
CCTransformHelp.cpp Migrated code to Matrix4 2013-12-10 11:07:15 -08:00
CCTransformHelp.h Migrated code to Matrix4 2013-12-10 11:07:15 -08:00
CCTween.cpp fixed compiler error 2013-12-17 19:32:16 +08:00
CCTween.h Add doxygen comments for the CocoStudio 2013-11-20 12:04:47 +08:00
CCTweenFunction.cpp 1.change blendfunc method 2013-12-13 15:02:09 +08:00
CCTweenFunction.h 1.change blendfunc method 2013-12-13 15:02:09 +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
CMakeLists.txt [cmake] output lib to root/lib 2013-11-04 21:03:08 +08:00
CSContentJsonDictionary.cpp fixed #3185 replace NULL to nullptr. 2013-11-14 14:05:24 +08:00
CSContentJsonDictionary.h Add doxygen comments for the CocoStudio 2013-11-20 12:04:47 +08:00
CocoStudio.h issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
DictionaryHelper.cpp fixed #3185 replace NULL to nullptr. 2013-11-14 14:05:24 +08:00
DictionaryHelper.h Add doxygen comments for the CocoStudio 2013-11-20 12:04:47 +08:00