axmol/cocos/editor-support/cocostudio
Huabing.Xu adcacbf5eb Merge branch 'develop' into develop_migrate_math_lib_merge
Conflicts:
	cocos/2d/CCLabelAtlas.cpp
	cocos/2d/CCLabelAtlas.h
	cocos/2d/CCLabelBMFont.cpp
	cocos/2d/CCLabelBMFont.h
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
2014-04-24 16:58:46 +08:00
..
WidgetReader replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
proj.win32 Modify windows project 2014-03-05 22:34:24 +08:00
proj.wp8 added wp8 support files and projects 2014-03-28 12:55:40 -07:00
Android.mk modify android makefile 2014-03-11 18:48:28 +08:00
CCActionFrame.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCActionFrame.h Migrate getPostion and correspondent member variable to Vector2 2014-04-15 16:28:59 +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 Update CCActionManagerEx.cpp 2014-03-25 12:41:16 +09:00
CCActionManagerEx.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCActionNode.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +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 replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCArmature.h replace Point with Vector2 2014-04-15 18:08:29 +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 adjust comment message 2014-04-10 11:14:46 +08:00
CCBatchNode.h draw() using Matrix instead of kmMat4 2014-04-08 22:07:35 +08:00
CCBone.cpp remove kmMat4 interface in cocostudio and UI 2014-04-09 14:44:54 +08:00
CCBone.h remove kmMat4 interface in cocostudio and UI 2014-04-09 14:44:54 +08:00
CCColliderDetector.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCColliderDetector.h replace Point with Vector2 2014-04-15 18:08:29 +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 no mp3 support for wp8 2014-03-22 06:13:02 -07: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 use CCComRender as parent for attaching component 2014-03-26 16:39:32 +08:00
CCComController.h add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
CCComRender.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCComRender.h add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
CCDataReaderHelper.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCDataReaderHelper.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCDatas.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCDatas.h replace Point with Vector2 2014-04-15 18:08:29 +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 replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCDisplayFactory.h add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
CCDisplayManager.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCDisplayManager.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
CCInputDelegate.cpp compiles on Android 2014-01-16 21:58:14 -08:00
CCInputDelegate.h issue #4729: Updates CCInputDelegate.h 2014-04-10 00:52:41 +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_migrate_math_lib_merge 2014-04-24 16:58:46 +08:00
CCSGUIReader.h let ios project compile correct 2014-03-11 18:48:26 +08:00
CCSSceneReader.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCSSceneReader.h 1. Spirte -> Sprite. 2014-03-26 17:55:35 +08:00
CCSkin.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCSkin.h remove kmMat4 interface in cocostudio and UI 2014-04-09 14:44:54 +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 replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCTransformHelp.h replace Point with Vector2 2014-04-15 18:08:29 +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 replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCUtilMath.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
CMakeLists.txt Modify mk file and solve warnings 2014-03-06 16:15:03 +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 Some warning fixes. 2014-03-14 15:38:43 +08:00
ObjectFactory.h Add custom widget and reader 2014-03-04 16:51:35 +08:00
TriggerBase.cpp Modify trigger 2014-03-04 23:55:36 +08:00
TriggerBase.h Memory leak fix in macro IMPLEMENT_CLASS_INFO 2014-04-12 12:58:00 +08:00
TriggerMng.cpp Some warning fixes in TriggerMng.cpp and TriggerObj.cpp 2014-03-12 14:07:34 +08:00
TriggerMng.h Compilation error fixes for linux port (clang compiler). 2014-03-07 13:52:54 +08:00
TriggerObj.cpp Some warning fixes in TriggerMng.cpp and TriggerObj.cpp 2014-03-12 14:07:34 +08:00
TriggerObj.h Compilation error fixes for linux port (clang compiler). 2014-03-07 13:52:54 +08:00