axmol/cocos/editor-support/cocostudio
minggo 326233ab02 Merge pull request #11105 from pipu/TextAtlas_parse_avoid_crash
Avoid crash during parse TextAtlas.
2015-03-25 13:36:28 +08:00
..
ActionTimeline Avoid timeline crash when custom widget is placed in scene. 2015-03-24 19:59:27 +08:00
WidgetReader Avoid crash during parse TextAtlas. 2015-03-24 15:59:21 +08:00
Android.mk To reconstruct object extension data. 2015-03-12 15:47:15 +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 windows works now 2014-07-24 12:57:39 +08:00
CCActionFrameEasing.cpp Platform fixed 2014-09-09 16:50:02 -07:00
CCActionFrameEasing.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
CCActionManagerEx.cpp add stopActionByName() 2014-12-11 02:57:13 +08:00
CCActionManagerEx.h add stopActionByName() 2014-12-11 02:57:13 +08:00
CCActionNode.cpp remove dead code 2014-09-04 11:00:48 +08:00
CCActionNode.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
CCActionObject.cpp Fixing conflict, use of macro function. 2014-10-11 13:06:42 -07:00
CCActionObject.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
CCArmature.cpp add DEPRECATED deprecated information for Armature::drawContour 2014-10-17 16:28:37 +08:00
CCArmature.h add DEPRECATED deprecated information for Armature::drawContour 2014-10-17 16:28:37 +08:00
CCArmatureAnimation.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCArmatureAnimation.h Adding missing virtual keywords 2015-03-16 16:39:43 +01:00
CCArmatureDataManager.cpp fix momery leak (partly fix, memory leak still exist). 2014-11-07 11:43:55 +08:00
CCArmatureDataManager.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +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 remove orderOfArrival = 0 2014-09-11 15:44:31 +08:00
CCBatchNode.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
CCBone.cpp Update CCBone.cpp 2014-11-06 17:51:19 +08:00
CCBone.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
CCColliderDetector.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCColliderDetector.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
CCComAttribute.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCComAttribute.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
CCComAudio.cpp no mp3 for winrt 2014-10-23 07:01:53 -07:00
CCComAudio.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
CCComBase.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
CCComController.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCComController.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
CCComRender.cpp fix warns and memory leak 2014-10-09 17:19:43 +08:00
CCComRender.h issue cocos2d/cocos2d-js #2563 : cccomrender need to use its constructor in jsb code. So i modify the constructor to public 2015-01-12 20:49:43 +08:00
CCDataReaderHelper.cpp Add comments of async load, to avoid confusions of developers. 2015-03-23 20:58:16 +08:00
CCDataReaderHelper.h remove unneeded includes 2014-08-29 15:39:52 +08:00
CCDatas.cpp fixed black edge in Armature 2014-07-23 20:07:33 +08:00
CCDatas.h Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] 2015-03-15 00:10:08 +01:00
CCDecorativeDisplay.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCDecorativeDisplay.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
CCDisplayFactory.cpp fix sprite frame cache, and remove unnecessary headers dependencies. 2014-11-07 09:13:59 +08:00
CCDisplayFactory.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
CCDisplayManager.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCDisplayManager.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
CCInputDelegate.cpp remove unneeded codes 2014-08-26 18:19:28 +08:00
CCInputDelegate.h Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07:00
CCObjectExtensionData.cpp Manage reference count of ActiontimelineData object in ObjectExtensionData. 2015-03-18 16:56:16 +08:00
CCObjectExtensionData.h Manage reference count of ActiontimelineData object in ObjectExtensionData. 2015-03-18 16:56:16 +08:00
CCProcessBase.cpp change CCTweenFunction class to tweenfunc namespace 2014-02-18 14:22:13 +08:00
CCProcessBase.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
CCSGUIReader.cpp fix cocostudio anchor point bug 2015-03-09 14:30:41 +08:00
CCSGUIReader.h Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] 2015-03-14 19:33:15 +01:00
CCSSceneReader.cpp fix some warnings / remove TABs 2014-10-23 12:54:15 +03:00
CCSSceneReader.h Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into 3.2-cocos-engine-PR 2014-08-21 16:07:19 +08:00
CCSkin.cpp Refactor draw command 2015-01-15 14:00:49 -08:00
CCSkin.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
CCSpriteFrameCacheHelper.cpp rename functions. 2014-11-19 15:27:55 +08:00
CCSpriteFrameCacheHelper.h rename functions. 2014-11-19 15:27:55 +08:00
CCTransformHelp.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCTransformHelp.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
CCTween.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCTween.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
CCUtilMath.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCUtilMath.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
CMakeLists.txt To reconstruct object extension data. 2015-03-12 15:47:15 +08:00
CSParse3DBinary_generated.h Add CocosStudio UserCameraReader 2015-02-25 14:19:08 +08:00
CSParseBinary_generated.h Serialize and parse attribute "inner speed" for ProjectNode. 2015-03-05 15:48:17 +08:00
CocoLoader.cpp 1. Fixes CCTimeLine warning. 2014-07-15 18:07:33 +08:00
CocoLoader.h fix compiling error on windows 2014-08-29 16:44:20 +08:00
CocoStudio.h Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-12-03 15:22:46 +08:00
CocosStudioExport.h added check for WinRT and WP8 2014-10-14 14:15:21 -07:00
DictionaryHelper.cpp Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07:00
DictionaryHelper.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
FlatBuffersSerialize.cpp Create flat buffer format data for "InnerActionSpeed". 2015-03-20 11:10:22 +08:00
FlatBuffersSerialize.h Parse InnerActionFrame, AlphaFrame, modify cocostudio editor version number. 2015-01-12 10:55:15 +08:00
TriggerBase.cpp Modify trigger 2014-03-04 23:55:36 +08:00
TriggerBase.h remove unneeded includes 2014-08-29 15:39:52 +08:00
TriggerMng.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
TriggerMng.h remove unneeded includes 2014-08-29 15:39:52 +08:00
TriggerObj.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
TriggerObj.h remove unneeded includes 2014-08-29 15:39:52 +08:00
WidgetCallBackHandlerProtocol.cpp Add callback framework using flat buffers 2014-11-27 16:49:19 +08:00
WidgetCallBackHandlerProtocol.h Add callback framework using flat buffers 2014-11-27 16:49:19 +08:00