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 dc711643cd Squashed commit of the following: 
commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed May 14 10:03:44 2014 -0700

    math renames

    `Vector2` -> `Vec2`
    `Vector3` -> `Vec3`
    `Vector4` -> `Vec4`
    `Matrix` -> `Mat4`

commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 09:24:28 2014 -0700

    raw version of rename Vector3

commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 09:07:14 2014 -0700

    rename Vector2 after merge

commit ab2ed58c129dbc30a4c0970ed94568c5d271657b
Merge: 1978d2d 86fb75a
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 09:05:30 2014 -0700

    Merge branch 'v3' into v3_renameMathClassName

    Conflicts:
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp

commit 1978d2d174877172ccddc083020a1bbf43ad3b39
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 08:51:45 2014 -0700

    rename vector2 in tests/cpp-empty-test folder

commit d4e0ff13dcce62724d2fece656543f26aa28e467
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:58:23 2014 -0700

    rename vector2 in tests/cpp-tests cpp files

commit be50ca2ec75e0fd32a6fcdaa15fe1ebb4cafe79f
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:52:57 2014 -0700

    rename vector2 in tests/cpp-tests head files

commit 6daef564400d4e28c4ce20859a68e0f583fed125
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:49:48 2014 -0700

    rename vector2 in extension folder

commit 8f3f0f65ceea92c9e7a0d87ab54e62220c5572e2
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:47:22 2014 -0700

    rename vector2 in cocos/2d cpp files

commit e1f3105aae06d595661a3030f519f7cc13aefbed
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:44:39 2014 -0700

    rename vector2 in cocos/2d head files

commit 6708d890bfe486109120c3cd4b9fe5c078b7108f
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:40:59 2014 -0700

    rename vector2 in cocos/base folder

commit d3978fa5447c31ea2f3ece5469b7e746dfba4248
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:40:43 2014 -0700

    rename vector2 in cocos/deprecated folder

commit 4bff45139363d6b9706edbbcf9f322d48b4fd019
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:40:26 2014 -0700

    rename vector2 in cocos/editor-support folder

commit 353d244c995f8b5d14f635c52aed8bc5e5fc1a6f
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:36:48 2014 -0700

    rename vector2 in cocos/ui folder

commit 758b8f4d513084b9922d7242e9b8f2c7f316de6c
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:32:39 2014 -0700

    rename vector2 in cocos/renderer folder

commit 0bd2710dd8714cecb993880bc37affd9ecb05c27
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:32:15 2014 -0700

    rename vector2 in cocos/physics folder

commit b7f0581c4587348bdbc1478d5374c2325735f21d
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:25:01 2014 -0700

    rename vector2 in cocos/math folder

commit a8631a8e1a4e2740807ccd9be9d70de6ecaad7dd
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:16:55 2014 -0700

    rename Vector2 to Vec2
    deprecate typedef Vector2
 		2014-05-14 10:07:09 -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 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-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-14 10:07:09 -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 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 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