Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/ui
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
..
proj.win32 issue #5057, fix windows compile error 2014-05-12 14:11:44 +08:00
proj.wp8 updated project files to latest version of cocos2d 2014-05-12 09:27:52 -07:00
Android.mk issue #5057, fix andriod and linux compile 2014-05-12 11:55:00 +08:00
CCProtectedNode.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CCProtectedNode.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
CMakeLists.txt issue #5057, fix andriod and linux compile 2014-05-12 11:55:00 +08:00
CocosGUI.cpp let ios project compile correct 2014-03-11 18:48:26 +08:00
CocosGUI.h issue #5057, Merge branch 'v3' into refactor5057 2014-05-09 15:39:02 +08:00
GUIDefine.h closed #5118, remove WidgetType and refactor LayoutType to Type 2014-05-12 18:00:54 +08:00
UIButton.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
UIButton.h issue #5057, refactor TextureResType to strong typed enum 2014-05-09 14:56:05 +08:00
UICheckBox.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
UICheckBox.h closed #5110, add const reference to typedef 2014-05-14 16:14:28 +08:00
UIDeprecated.h closed #5118, remove WidgetType and refactor LayoutType to Type 2014-05-12 18:00:54 +08:00
UIHBox.cpp closed #5118, remove WidgetType and refactor LayoutType to Type 2014-05-12 18:00:54 +08:00
UIHBox.h Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
UIHelper.cpp issue #5057, convert const char* to std::string& 2014-05-12 14:59:00 +08:00
UIHelper.h issue #5057, convert const char* to std::string& 2014-05-12 14:59:00 +08:00
UIImageView.cpp issue #5057, refactor TextureResType to strong typed enum 2014-05-09 14:56:05 +08:00
UIImageView.h issue #5057, refactor TextureResType to strong typed enum 2014-05-09 14:56:05 +08:00
UILayout.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
UILayout.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
UILayoutParameter.cpp issue #5057, convert const char* to std::string& 2014-05-12 14:59:00 +08:00
UILayoutParameter.h Merge pull request #6685 from andyque/refactor5118 2014-05-13 11:35:36 +08:00
UIListView.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
UIListView.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
UILoadingBar.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
UILoadingBar.h closed #5110, refactor 2014-05-14 17:07:24 +08:00
UIPageView.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
UIPageView.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
UIRelativeBox.cpp closed #5118, remove WidgetType and refactor LayoutType to Type 2014-05-12 18:00:54 +08:00
UIRelativeBox.h Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
UIRichText.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
UIRichText.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
UIScrollInterface.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
UIScrollView.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
UIScrollView.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
UISlider.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
UISlider.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
UIText.cpp Merge pull request #6730 from andyque/refactor5110 2014-05-14 17:47:47 +08:00
UIText.h Merge pull request #6730 from andyque/refactor5110 2014-05-14 17:47:47 +08:00
UITextAtlas.cpp closed #5110, add const specifier to getStringLength function 2014-05-14 16:25:30 +08:00
UITextAtlas.h closed #5110, add const specifier to getStringLength function 2014-05-14 16:25:30 +08:00
UITextBMFont.cpp closed #5110, add const specifier to getStringLength function 2014-05-14 16:25:30 +08:00
UITextBMFont.h closed #5110, add const specifier to getStringLength function 2014-05-14 16:25:30 +08:00
UITextField.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
UITextField.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
UIVBox.cpp closed #5118, remove WidgetType and refactor LayoutType to Type 2014-05-12 18:00:54 +08:00
UIVBox.h Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
UIVideoPlayer.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00
UIVideoPlayerAndroid.cpp issue #5110, fix VideoPlayer android compile error 2014-05-14 14:44:04 +08:00
UIVideoPlayerIOS.mm Squashed commit of the following: 2014-05-14 10:07:09 -07:00
UIWidget.cpp Squashed commit of the following: 2014-05-14 10:07:09 -07:00
UIWidget.h Squashed commit of the following: 2014-05-14 10:07:09 -07:00