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
chengstory 8ae7ecff33 Merge branch 'develop' into #3457 
Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
	cocos/editor-support/cocostudio/CCSGUIReader.h
 		2013-12-26 12:55:52 +08:00
..
proj.win32 issue #3456 replace jsoncpp to rapidjson. 2013-12-24 20:33:55 +08:00
Android.mk Merge branch 'develop' into #3457 2013-12-26 12:55:52 +08:00
CCActionEaseEx.cpp issue #3456 ios test rapidjson. 2013-12-24 21:23:24 +08:00
CCActionEaseEx.h issue #3456 ios test rapidjson. 2013-12-24 21:23:24 +08:00
CCActionFrame.cpp issue #3456 replace jsoncpp to rapidjson. 2013-12-24 20:33:55 +08:00
CCActionFrame.h issue #3456 replace jsoncpp to rapidjson. 2013-12-24 20:33:55 +08:00
CCActionFrameEasing.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
CCActionFrameEasing.h issue #3456 replace jsoncpp to rapidjson. 2013-12-24 20:33:55 +08:00
CCActionManagerEx.cpp fixed warning 2013-12-25 19:46:09 +08:00
CCActionManagerEx.h fixed warning 2013-12-25 19:46:09 +08:00
CCActionNode.cpp Merge branch 'develop' into #3457 2013-12-26 12:55:52 +08:00
CCActionNode.h fixed warning 2013-12-25 19:46:09 +08:00
CCActionObject.cpp fixed warning 2013-12-25 19:46:09 +08:00
CCActionObject.h fixed warning 2013-12-25 19:46:09 +08:00
CCArmature.cpp change std::string compare method 2013-12-24 11:05:53 +08:00
CCArmature.h change const char* to const std::string& 2013-12-23 14:05:46 +08:00
CCArmatureAnimation.cpp change const char* to const std::string& 2013-12-23 14:05:46 +08:00
CCArmatureAnimation.h change const char* to const std::string& 2013-12-23 14:05:46 +08:00
CCArmatureDataManager.cpp change const char* to const std::string& 2013-12-23 14:05:46 +08:00
CCArmatureDataManager.h change const char* to const std::string& 2013-12-23 14:05:46 +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 Merge branch 'develop' into #3457 2013-12-26 12:55:52 +08:00
CCComAttribute.h Merge branch 'develop' into #3457 2013-12-26 12:55:52 +08:00
CCComAudio.cpp Test triiger 3.0 2013-12-26 01:17:04 +08:00
CCComAudio.h Test triiger 3.0 2013-12-26 01:17:04 +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 fixed warning 2013-12-25 19:46:09 +08:00
CCDataReaderHelper.h Merge branch 'develop' into #3456 2013-12-24 22:05:13 +08:00
CCDatas.cpp fixed warning 2013-12-25 19:46:09 +08:00
CCDatas.h fixed warning 2013-12-25 19:46:09 +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 Merge branch 'develop' into #3457 2013-12-26 12:55:52 +08:00
CCSGUIReader.h Merge branch 'develop' into #3457 2013-12-26 12:55:52 +08:00
CCSSceneReader.cpp Merge branch 'develop' into #3457 2013-12-26 12:55:52 +08:00
CCSSceneReader.h issue #3456 replace jsoncpp to rapidjson. 2013-12-24 20:33:55 +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 Merge branch 'develop' into #3457 2013-12-26 12:55:52 +08:00
CocoStudio.h upload trigger code. 2013-12-25 17:40:54 +08:00
DictionaryHelper.cpp fixed warning 2013-12-25 19:46:09 +08:00
DictionaryHelper.h fixed warning 2013-12-25 19:46:09 +08:00
ObjectFactory.cpp Test triiger 3.0 2013-12-26 01:17:04 +08:00
ObjectFactory.h upload trigger code. 2013-12-25 17:40:54 +08:00
TriggerBase.cpp Test triiger 3.0 2013-12-26 01:17:04 +08:00
TriggerBase.h upload trigger code. 2013-12-25 17:40:54 +08:00
TriggerMng.cpp Merge branch 'develop' into #3457 2013-12-26 12:55:52 +08:00
TriggerMng.h Merge branch 'develop' into #3457 2013-12-26 12:55:52 +08:00
TriggerObj.cpp Test triiger 3.0 2013-12-26 01:17:04 +08:00
TriggerObj.h fixed warning 2013-12-25 19:46:09 +08:00