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 9b118e5e96 Squashed commit of the following: 
commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 10:10:06 2014 -0700

    Updates templates files

commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 10:08:19 2014 -0700

    compiles on Windows

commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:55:30 2014 -0700

    adds cocos2d.h

commit 4c3d14f929bac017b93ca843b4f149d352264a30
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:54:24 2014 -0700

    re-adds missing files

commit f729181728959260d14c4152555534f5beec8e05
Merge: 148da79 2adac67
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:51:12 2014 -0700

    Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes

commit 148da79010c5dffeab885933624cffaf3d588852
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:49:12 2014 -0700

    Adds SimpleAudioEngine

commit 2adac67019180ec82b7bd03f0b67c12f62e29e77
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:47:45 2014 -0700

    Compiles for Android

commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:13:35 2014 -0700

    Fixes the includes
 		2014-04-26 10:11:22 -07: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 Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionFrame.h Squashed commit of the following: 2014-04-26 10:11:22 -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 Squashed commit of the following: 2014-04-26 10:11:22 -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-26 10:11:22 -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-26 10:11:22 -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 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 Squashed commit of the following: 2014-04-26 10:11:22 -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 Squashed commit of the following: 2014-04-26 10:11:22 -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 Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCInputDelegate.h Squashed commit of the following: 2014-04-26 10:11:22 -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 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 Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCSkin.h Squashed commit of the following: 2014-04-26 10:11:22 -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