axmol/cocos/editor-support/cocostudio
Dale Stammen 9ee4b4af1e Merge branch 'v3' into v3-winrt-audio 2015-05-27 11:54:21 -07:00
..
ActionTimeline Merge pull request #11785 from geron-cn/fixbug 2015-05-27 16:28:13 +08:00
WidgetReader upgrade rapidjson to 1.0.2 2015-05-25 11:43:03 +08:00
Android.mk Remove CCNodeReader.h/.cpp. 2015-04-01 13:37:36 +08:00
CCActionFrame.cpp
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 Optimize Vec2 2015-04-19 20:40:52 +03:00
CCArmature.h add DEPRECATED deprecated information for Armature::drawContour 2014-10-17 16:28:37 +08:00
CCArmatureAnimation.cpp Fix ArmatureAnimation crash 2015-05-18 12:08:26 +08: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
CCArmatureDefine.h
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 Added MP3 support to simple audio engine 2015-05-27 10:57:26 -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 upgrade rapidjson to 1.0.2 2015-05-25 11:43:03 +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 Optimize Vec2 2015-04-19 20:40:52 +03: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
CCProcessBase.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
CCSGUIReader.cpp upgrade rapidjson to 1.0.2 2015-05-25 11:43:03 +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 Optimize Vec3 2015-04-05 13:09:50 +03: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
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 Optimize Vec2 2015-04-19 20:40:52 +03:00
CCUtilMath.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
CMakeLists.txt Add method destroyCocosStudio() for CocoStudio 2015-03-31 19:55:56 +08:00
CSParse3DBinary_generated.h Add CocosStudio UserCameraReader 2015-02-25 14:19:08 +08:00
CSParseBinary_generated.h Modify that parse text shadow and outline. 2015-04-20 11:39:43 +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.cpp Supplement invoke destroyInstance() of some Reader in destroyCocosStudio(). 2015-04-01 14:08:09 +08:00
CocoStudio.h Add method destroyCocosStudio() for CocoStudio 2015-03-31 19:55:56 +08:00
CocosStudioExport.h added check for WinRT and WP8 2014-10-14 14:15:21 -07:00
DictionaryHelper.cpp fix assert failure of NinePatchImageParser and rapidjson 2015-05-26 17:20:10 +08:00
DictionaryHelper.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
FlatBuffersSerialize.cpp Optimize Vec2 2015-04-19 20:40:52 +03:00
FlatBuffersSerialize.h Animation easing. 2015-04-09 16:55:15 +08:00
TriggerBase.cpp
TriggerBase.h remove unneeded includes 2014-08-29 15:39:52 +08:00
TriggerMng.cpp upgrade rapidjson to 1.0.2 2015-05-25 11:43:03 +08: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