Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/editor-support/cocostudio
History
pipu 9503253a17 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_pipu 2014-10-12 17:44:28 +08:00
..
ActionTimeline Removing ../../ in header file include 2014-10-11 15:50:44 +08:00
WidgetReader Removing ../../ in header file include 2014-10-11 15:50:44 +08:00
proj.wp8 Reverting cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj, cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj.filters 2014-10-12 17:06:26 +08:00
Android.mk Modifying cocos2d_lib.xcodeproj, cocos/Android.mk, cocos/editor-support/cocostudio/Android.mk 2014-10-12 15:39:22 +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 Merge pull request #7785 from DaisukeHashimoto/fix_CCActionManagerEx_Bug 2014-10-10 11:13:41 +08:00
CCActionManagerEx.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +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 scheduler and macro fixes 2014-10-03 09:38:36 -07:00
CCActionObject.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
CCArmature.cpp replace tab to 4 spaces 2014-09-24 15:14:47 +08:00
CCArmature.h replace tab to 4 spaces 2014-09-24 15:14:47 +08:00
CCArmatureAnimation.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCArmatureAnimation.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
CCArmatureDataManager.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07: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 Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07: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 Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -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 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
CCDataReaderHelper.cpp scheduler and macro fixes 2014-10-03 09:38:36 -07: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 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08: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 Squashed commit of the following: 2014-05-14 10:07:09 -07: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
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 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_pipu 2014-10-12 17:44:28 +08:00
CCSGUIReader.h Add protocolbuf.a 2014-10-09 18:28:09 +08:00
CCSSceneReader.cpp Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-win32-warn 2014-10-10 17:02:45 +08: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 Adds MARK: TODO: FIXME: in code 2014-08-29 12:54:24 -07:00
CCSkin.h 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
CCSpriteFrameCacheHelper.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCSpriteFrameCacheHelper.h Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07: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 Multi platform cmake support 2014-10-03 23:21:45 +01:00
CSParseBinary.pb.cc Add protocolbuf.a 2014-10-09 18:28:09 +08:00
CSParseBinary.pb.h Add protocolbuf.a 2014-10-09 18:28:09 +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 Add protocolbuf.a 2014-10-09 18:28:09 +08:00
CocosStudioExport.h added support for static and shared builds with audio and studio 2014-10-03 23:20:52 +01: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
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