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
Ricardo Quesada c386f88e32 Merge branch 'develop' into visit_draw_improved 
Conflicts:
	CHANGELOG
	cocos/gui/UILayout.h
 		2014-03-03 11:27:42 -08:00
..
proj.win32 fix cross-platform comiple error 2014-02-18 14:22:15 +08:00
Android.mk fix cross-platform comiple error 2014-02-18 14:22:15 +08:00
CCActionFrame.cpp move CCActionEaseEx content to CCActionEase 2014-02-18 14:22:13 +08:00
CCActionFrame.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCActionFrameEasing.cpp issue #4058: Adds CCStdC.h. 2014-02-20 15:12:35 +08:00
CCActionFrameEasing.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCActionManagerEx.cpp issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCActionManagerEx.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCActionNode.cpp fixed #3829. change namespace gui to ui 2014-02-25 10:18:44 +08:00
CCActionNode.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCActionObject.cpp issue #4165: Scheduler::scheduleCallback -> Scheduler::schedule, Scheduler::scheduleSelector -> Scheduler::schedule. APIs are clear for c++ developers now. 2014-03-03 11:00:30 +08:00
CCActionObject.h closed #4097: Adds a macro to disable inserting script binding relevant codes. 2014-02-20 16:40:46 +08:00
CCArmature.cpp Cache working OK. 2014-02-28 16:10:48 -08:00
CCArmature.h Cache working OK. 2014-02-28 16:10:48 -08:00
CCArmatureAnimation.cpp issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCArmatureAnimation.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCArmatureDataManager.cpp issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCArmatureDataManager.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +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 Cache working OK. 2014-02-28 16:10:48 -08:00
CCBatchNode.h Cache working OK. 2014-02-28 16:10:48 -08:00
CCBone.cpp GlobalZOrder is used for render priority... 2014-01-18 11:38:06 -08:00
CCBone.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCColliderDetector.cpp add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
CCColliderDetector.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCComAttribute.cpp add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
CCComAttribute.h add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
CCComAudio.cpp add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
CCComAudio.h add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
CCComBase.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCComController.cpp add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
CCComController.h add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
CCComRender.cpp fixed #3829. change namespace gui to ui 2014-02-25 10:18:44 +08:00
CCComRender.h add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
CCDataReaderHelper.cpp issue #4165: Scheduler::scheduleCallback -> Scheduler::schedule, Scheduler::scheduleSelector -> Scheduler::schedule. APIs are clear for c++ developers now. 2014-03-03 11:00:30 +08:00
CCDataReaderHelper.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCDatas.cpp change CCTweenFunction class to tweenfunc namespace 2014-02-18 14:22:13 +08:00
CCDatas.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCDecorativeDisplay.cpp issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCDecorativeDisplay.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCDisplayFactory.cpp Merge branch 'develop' into visit_draw_improved 2014-03-03 11:27:42 -08:00
CCDisplayFactory.h add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
CCDisplayManager.cpp fixed add ParticleSystem display crashed 2014-03-03 14:56:56 +08:00
CCDisplayManager.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCInputDelegate.cpp compiles on Android 2014-01-16 21:58:14 -08:00
CCInputDelegate.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCProcessBase.cpp change CCTweenFunction class to tweenfunc namespace 2014-02-18 14:22:13 +08:00
CCProcessBase.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCSGUIReader.cpp Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-02 19:28:44 +08:00
CCSGUIReader.h fixed #3829. change namespace gui to ui 2014-02-25 10:18:44 +08:00
CCSSceneReader.cpp fixed #3829. change namespace gui to ui 2014-02-25 10:18:44 +08:00
CCSSceneReader.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCSkin.cpp Cache working OK. 2014-02-28 16:10:48 -08:00
CCSkin.h Cache working OK. 2014-02-28 16:10:48 -08:00
CCSpriteFrameCacheHelper.cpp removes "include "cocos2d.h" from cocos2d files 2014-01-16 21:35:58 -08:00
CCSpriteFrameCacheHelper.h Fixes compilation issues on Linux 2014-01-16 21:49:14 -08:00
CCTransformHelp.cpp add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
CCTransformHelp.h add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
CCTween.cpp fix cross-platform comiple error 2014-02-18 14:22:15 +08:00
CCTween.h fix cross-platform comiple error 2014-02-18 14:22:15 +08:00
CCUtilMath.cpp add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
CCUtilMath.h removes "include "cocos2d.h" from cocos2d files 2014-01-16 21:35:58 -08:00
CMakeLists.txt fix cross-platform comiple error 2014-02-18 14:22:15 +08:00
CocoStudio.h move CCActionEaseEx and CCTweenFunction to core engine 2014-02-18 14:22:12 +08:00
DictionaryHelper.cpp removes "include "cocos2d.h" from cocos2d files 2014-01-16 21:35:58 -08:00
DictionaryHelper.h removes "include "cocos2d.h" from cocos2d files 2014-01-16 21:35:58 -08:00
ObjectFactory.cpp issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
ObjectFactory.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
TriggerBase.cpp add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
TriggerBase.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
TriggerMng.cpp closed #4097: Adds a macro to disable inserting script binding relevant codes. 2014-02-20 16:40:46 +08:00
TriggerMng.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
TriggerObj.cpp closed #3833: SceneTest of CocoStudio crashes 2014-01-24 11:50:58 +08:00
TriggerObj.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00