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
CaiWenzhi 0a46b3c8d2 Merge branch 'v3' into v3_nutty_fixedreaderbug 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 		2014-05-08 15:56:34 +08:00
..
WidgetReader Merge pull request #6386 from pipu/fixed_bug_ui_layout_clip 2014-04-28 11:08:40 +08:00
proj.win32 upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found). 2014-05-07 17:41:04 +03:00
proj.wp8 added wp8 support files and projects 2014-03-28 12:55:40 -07:00
Android.mk Moves cocos/2d/Android.mk to cocos/Android.mk 2014-05-01 14:09:26 -07:00
CCActionFrame.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionFrame.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCActionFrameEasing.cpp issue #4058: Adds CCStdC.h. 2014-02-20 15:12:35 +08:00
CCActionFrameEasing.h Squashed commit of the following: 2014-04-26 10:11:22 -07: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 Improved directory structure 2014-04-29 17:37:36 -07:00
CCActionObject.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCArmature.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCArmature.h Compiles on Windows32 2014-04-25 22:03:25 -07: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 Squashed commit of the following: 2014-04-26 10:11:22 -07: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 Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCBatchNode.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCBone.cpp remove kmMat4 interface in cocostudio and UI 2014-04-09 14:44:54 +08:00
CCBone.h Squashed commit of the following: 2014-04-26 10:11:22 -07: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 Squashed commit of the following: 2014-04-30 19:09:13 -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 Improved directory structure 2014-04-29 17:37:36 -07: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 Improved directory structure 2014-04-29 17:37:36 -07:00
CCDecorativeDisplay.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCDecorativeDisplay.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCDisplayFactory.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCDisplayFactory.h add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
CCDisplayManager.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCDisplayManager.h replace Point with Vector2 2014-04-15 18:08:29 +08:00
CCInputDelegate.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCInputDelegate.h Improved directory structure 2014-04-29 17:37:36 -07: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 Fixed bug of guireader 2014-05-08 15:15:09 +08:00
CCSGUIReader.h let ios project compile correct 2014-03-11 18:48:26 +08:00
CCSSceneReader.cpp Squashed commit of the following: 2014-04-30 19:09:13 -07:00
CCSSceneReader.h 1. Spirte -> Sprite. 2014-03-26 17:55:35 +08:00
CCSkin.cpp Improved directory structure 2014-04-29 17:37:36 -07:00
CCSkin.h Improved directory structure 2014-04-29 17:37:36 -07:00
CCSpriteFrameCacheHelper.cpp Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCSpriteFrameCacheHelper.h Squashed commit of the following: 2014-04-26 10:11:22 -07: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 Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCUtilMath.cpp replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
CCUtilMath.h Squashed commit of the following: 2014-04-26 10:11:22 -07: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 Squashed commit of the following: 2014-04-26 10:11:22 -07: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