axmol/cocos/editor-support/cocostudio
pandamicro e2568b3a6f Merge branch 'v3' of github.com:cocos2d/cocos2d-x into hbmemory
Conflicts:
	tests/js-memory-gc-tests/src/tests-main.js
2016-01-28 01:12:49 +08:00
..
ActionTimeline Merge pull request #14888 from xiaofeng11/v3_actiontimeline 2016-01-21 15:35:30 +08:00
WidgetReader fix code indent 2016-01-21 11:33:13 +08:00
Android.mk update for light3d reader 2015-11-03 13:34:21 +08:00
CCActionFrame.cpp
CCActionFrame.h Fix typos in comments and documentation 2016-01-12 13:27:06 +09:00
CCActionFrameEasing.cpp
CCActionFrameEasing.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCActionManagerEx.cpp Remove boring logs in cocos studio supporting module. 2015-11-27 14:43:25 +08:00
CCActionManagerEx.h Fix typos in comments and documentation 2016-01-12 13:27:06 +09:00
CCActionNode.cpp Bug fix for ActionNode in CocosStudio, please don't use weak reference. 2015-12-07 15:06:50 +08:00
CCActionNode.h fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
CCActionObject.cpp Fix ActionManagerEx some times crash when reload action frames. 2015-10-26 10:38:17 +08:00
CCActionObject.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCArmature.cpp fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
CCArmature.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCArmatureAnimation.cpp Issue fixes for new memory model 2015-12-21 00:16:17 +08:00
CCArmatureAnimation.h Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory 2016-01-18 16:40:00 +08:00
CCArmatureDataManager.cpp Fix deprecated warnings 2015-11-13 14:38:48 +09:00
CCArmatureDataManager.h Fix typos in comments and documentation 2016-01-12 13:27:06 +09:00
CCArmatureDefine.cpp
CCArmatureDefine.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCBatchNode.cpp Fixed bug: wrong usage of isVisitableByVisitingCamera, which should only effect draw call. 2015-06-18 10:32:30 +08:00
CCBatchNode.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCBone.cpp Issue fixes for new memory model 2015-12-21 00:16:17 +08:00
CCBone.h Fix typos in comments and documentation 2016-01-12 13:27:06 +09:00
CCColliderDetector.cpp Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
CCColliderDetector.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCComAttribute.cpp Refine components to improve performance 2015-09-18 14:34:02 +08:00
CCComAttribute.h Fix inconsistent header include guards 2015-12-12 21:05:22 +09:00
CCComAudio.cpp add PlayableFrame 2016-01-12 17:21:01 +08:00
CCComAudio.h add PlayableFrame 2016-01-12 17:21:01 +08:00
CCComBase.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCComController.cpp Refine components to improve performance 2015-09-18 14:34:02 +08:00
CCComController.h Fix inconsistent header include guards 2015-12-12 21:05:22 +09:00
CCComExtensionData.cpp Refine components to improve performance 2015-09-18 14:34:02 +08:00
CCComExtensionData.h Refine components to improve performance 2015-09-18 14:34:02 +08:00
CCComRender.cpp Refine components to improve performance 2015-09-18 14:34:02 +08:00
CCComRender.h Fix inconsistent header include guards 2015-12-12 21:05:22 +09:00
CCDataReaderHelper.cpp Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
CCDataReaderHelper.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCDatas.cpp Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
CCDatas.h Fix typos in comments and documentation 2016-01-12 13:27:06 +09:00
CCDecorativeDisplay.cpp
CCDecorativeDisplay.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCDisplayFactory.cpp Use string::empty() to check whether string is empty. 2015-09-01 11:26:09 +08:00
CCDisplayFactory.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCDisplayManager.cpp Fix 1.6 version bone animation crash when perform getBoneAtPoint(0,0) 2015-09-14 17:36:19 +08:00
CCDisplayManager.h Fix typos in comments and documentation 2016-01-12 13:27:06 +09:00
CCInputDelegate.cpp
CCInputDelegate.h Fix inconsistent header include guards 2015-12-12 21:05:22 +09:00
CCProcessBase.cpp fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
CCProcessBase.h fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
CCSGUIReader.cpp remove duplicate include 2015-10-16 21:41:40 +08:00
CCSGUIReader.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCSSceneReader.cpp Remove boring logs in cocos studio supporting module. 2015-11-27 14:43:25 +08:00
CCSSceneReader.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCSkin.cpp fix cocostudio skin setfliped. 2015-08-11 10:34:22 +08:00
CCSkin.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCSpriteFrameCacheHelper.cpp fix the issue #14113 2015-10-23 00:00:18 +08:00
CCSpriteFrameCacheHelper.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCTransformHelp.cpp
CCTransformHelp.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CCTween.cpp Use string::empty() to check whether string is empty. 2015-09-01 11:26:09 +08:00
CCTween.h Fix typos in comments and documentation 2016-01-12 13:27:06 +09:00
CCUtilMath.cpp Optimize Vec2 2015-04-19 20:40:52 +03:00
CCUtilMath.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CMakeLists.txt update for light3d reader 2015-11-03 13:34:21 +08:00
CSParse3DBinary_generated.h update for light3D 2015-09-29 18:33:28 +08:00
CSParseBinary_generated.h add scrollview bar parse for cocostudio in reader 2016-01-20 21:13:59 +08:00
CocoLoader.cpp Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
CocoLoader.h GBKToUTF8 2015-06-17 13:16:06 +08:00
CocoStudio.cpp Supplement invoke destroyInstance() of some Reader in destroyCocosStudio(). 2015-04-01 14:08:09 +08:00
CocoStudio.h add bonenode to CocoStudio.h 2015-07-23 13:34:11 +08:00
CocosStudioExport.h Update 3d reader for compatible with cocosstudio 3.1.2 version csd file 2015-06-23 11:31:16 +08:00
CocosStudioExtension.cpp Editing code as comment. 2015-12-04 10:43:39 +08:00
CocosStudioExtension.h Replace 'ResouceData' with 'ResourceData' 2015-12-05 18:59:54 +09:00
DictionaryHelper.cpp fix assert failure of NinePatchImageParser and rapidjson 2015-05-26 17:20:10 +08:00
DictionaryHelper.h GBKToUTF8 2015-06-17 13:16:06 +08:00
FlatBuffersSerialize.cpp Fix typos in comments and documentation 2016-01-12 13:27:06 +09:00
FlatBuffersSerialize.h Update reader, add BlendFrame supporting to Skeleton Animation 2015-08-17 13:05:29 +08:00
TriggerBase.cpp Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
TriggerBase.h Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
TriggerMng.cpp Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
TriggerMng.h GBKToUTF8 2015-06-17 13:16:06 +08:00
TriggerObj.cpp Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
TriggerObj.h GBKToUTF8 2015-06-17 13:16:06 +08:00
WidgetCallBackHandlerProtocol.cpp
WidgetCallBackHandlerProtocol.h GBKToUTF8 2015-06-17 13:16:06 +08:00