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
andyque 5624da5448 Merge branch 'v3' into cleanupBinaryLoader 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/editor-support/cocostudio/CCSGUIReader.h
	cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters
 		2014-06-23 09:37:39 +08:00
..
ActionTimeline support Label widget 2014-06-19 14:11:37 +08:00
WidgetReader refactor - replace magic string with const string 2014-06-19 17:04:14 +08:00
proj.win32 Merge branch 'v3' into cleanupBinaryLoader 2014-06-23 09:37:39 +08:00
proj.wp8 added missing files and tests that broke wp8 build 2014-06-20 09:07:51 -07:00
Android.mk Merge branch 'v3' into cleanupBinaryLoader 2014-06-23 09:37:39 +08:00
CCActionFrame.cpp Add new line at the end of a file to *.cpp 2014-06-19 20:45:24 +09:00
CCActionFrame.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCActionFrameEasing.cpp Add new line at the end of a file to *.cpp 2014-06-19 20:45:24 +09:00
CCActionFrameEasing.h Squashed commit of the following: 2014-04-26 10:11:22 -07:00
CCActionManagerEx.cpp add ui animation for binary parsing 2014-06-18 15:55:01 +08:00
CCActionManagerEx.h add ui animation for binary parsing 2014-06-18 15:55:01 +08:00
CCActionNode.cpp add ui animation for binary parsing 2014-06-18 15:55:01 +08:00
CCActionNode.h add ui animation for binary parsing 2014-06-18 15:55:01 +08:00
CCActionObject.cpp Merge branch 'v3' into cleanupBinaryLoader 2014-06-23 09:37:39 +08:00
CCActionObject.h add ui animation for binary parsing 2014-06-18 15:55:01 +08:00
CCArmature.cpp Merge pull request #7054 from 2youyouo2/v3 2014-06-19 21:05:15 +08:00
CCArmature.h issue #4693: add getName(), setName() and getChildByName() 2014-06-11 16:57:43 +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 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 Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCBatchNode.h Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCBone.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCBone.h issue #4693: add getName(), setName() and getChildByName() 2014-06-11 16:57:43 +08: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 fix ObjectFactory refactor issue 2014-06-04 14:56:34 +08:00
CCComAttribute.h fix ObjectFactory refactor issue 2014-06-04 14:56:34 +08:00
CCComAudio.cpp fix ObjectFactory refactor issue 2014-06-04 14:56:34 +08:00
CCComAudio.h fix ObjectFactory refactor issue 2014-06-04 14:56:34 +08:00
CCComBase.h fix ObjectFactory refactor issue 2014-06-04 14:56:34 +08:00
CCComController.cpp fix ObjectFactory refactor issue 2014-06-04 14:56:34 +08:00
CCComController.h fix ObjectFactory refactor issue 2014-06-04 14:56:34 +08:00
CCComRender.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCComRender.h fix ObjectFactory refactor issue 2014-06-04 14:56:34 +08:00
CCDataReaderHelper.cpp Merge branch 'v3' into cleanupBinaryLoader 2014-06-23 09:37:39 +08:00
CCDataReaderHelper.h add binary read to test-cpp 2014-06-18 20:09:12 +08:00
CCDatas.cpp Merge pull request #6734 from 2youyouo2/v3 2014-05-17 12:17:34 +08: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 Merge branch 'v3' into cleanupBinaryLoader 2014-06-23 09:37:39 +08:00
CCSGUIReader.h Merge branch 'v3' into cleanupBinaryLoader 2014-06-23 09:37:39 +08:00
CCSSceneReader.cpp fix cannot compile in windows 2014-06-18 14:35:43 +08:00
CCSSceneReader.h fix ObjectFactory refactor issue 2014-06-04 14:56:34 +08:00
CCSkin.cpp Adds setNormalizedPosition() 2014-05-30 16:42:05 -07:00
CCSkin.h Adds setNormalizedPosition() 2014-05-30 16:42:05 -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 Merge branch 'v3' into cleanupBinaryLoader 2014-06-23 09:37:39 +08:00
CocoLoader.cpp update loader 2014-06-18 11:54:25 +08:00
CocoLoader.h fix android compile error 2014-06-18 18:25:31 +08:00
CocoStudio.h change ActionTimeline to cocostudio ActionTimeline folder 2014-06-13 18:51:32 +08:00
DictionaryHelper.cpp Add new line at the end of a file to *.cpp 2014-06-19 20:45:24 +09:00
DictionaryHelper.h removes "include "cocos2d.h" from cocos2d files 2014-01-16 21:35:58 -08:00
TriggerBase.cpp Modify trigger 2014-03-04 23:55:36 +08:00
TriggerBase.h refact ui header file include 2014-06-04 14:56:33 +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