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 0f67247325 Squashed commit of the following: 
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 14:33:49 2014 -0700

    Yeah... everything compiles on win32 and wp8

commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 13:58:38 2014 -0700

    CCIME moved to base

    and compiles on Android

commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 13:02:57 2014 -0700

    compiles Ok for Windows Phone 8

commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 12:25:31 2014 -0700

    fixes for Windows Phone 8

commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 11:15:13 2014 -0700

    Compiles on Win32

commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 10:08:31 2014 -0700

    Compiles on linux!

commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 09:30:42 2014 -0700

    moves cocos/2d/platform -> cocos/platform

commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 08:24:41 2014 -0700

    Merge remote-tracking branch 'cocos2d/v3' into files

commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu May 15 19:36:23 2014 -0700

    files in the correct directory
 		2014-05-16 14:36:00 -07:00
..
WidgetReader Squashed commit of the following: 2014-05-14 10:07:09 -07: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-05-14 10:07:09 -07:00
CCActionFrame.h Squashed commit of the following: 2014-05-14 10:07:09 -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 Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCActionNode.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCActionObject.cpp FIx: correct TotalTime of ActionObject. 2014-05-08 10:28:41 +08:00
CCActionObject.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCArmature.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCArmature.h Squashed commit of the following: 2014-05-14 10:07:09 -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-05-14 10:07:09 -07:00
CCBatchNode.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCBone.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCBone.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCColliderDetector.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCColliderDetector.h Squashed commit of the following: 2014-05-14 10:07:09 -07: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 Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCComRender.h add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
CCDataReaderHelper.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCDataReaderHelper.h issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
CCDatas.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCDatas.h Squashed commit of the following: 2014-05-14 10:07:09 -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-05-14 10:07:09 -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-05-14 10:07:09 -07:00
CCDisplayManager.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCInputDelegate.cpp Squashed commit of the following: 2014-05-16 14:36:00 -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 Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCSGUIReader.h closed #5118, refactor, improving variable name 2014-05-13 09:56:10 +08:00
CCSSceneReader.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCSSceneReader.h 1. Spirte -> Sprite. 2014-03-26 17:55:35 +08:00
CCSkin.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCSkin.h Squashed commit of the following: 2014-05-14 10:07:09 -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 Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCTransformHelp.h Squashed commit of the following: 2014-05-14 10:07:09 -07: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 Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCUtilMath.h Squashed commit of the following: 2014-05-14 10:07:09 -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