Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
20,886 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

314 Commits

Author SHA1 Message Date
andyque 070abfdb44 add constness to UIVideoPlayer 2014-05-27 11:30:36 +08:00
andyque 3cda4e76a0 add constness to UIImageView 2014-05-27 11:30:36 +08:00
andyque eb91aed3f2 add constness to UICheckBox 2014-05-27 11:30:36 +08:00
andyque f87e4243ee add constness to UIButton 2014-05-27 11:30:36 +08:00
andyque 884d4c5d1f add constness to UITextField 2014-05-27 11:30:36 +08:00
andyque 5da1f1f78c add constness to UIText 2014-05-27 11:30:36 +08:00
andyque 5acd2ed89d add constness to UISlider 2014-05-27 11:30:36 +08:00
andyque 36e7c9cdfc add constness to UIScrollView 2014-05-27 11:30:36 +08:00
andyque e1f9ff7eaa add constness to UIPageView 2014-05-27 11:30:36 +08:00
andyque 78ac4b4d86 add constness to UILoadingBar 2014-05-27 11:30:35 +08:00
andyque 0518e494b1 add constness to UIListView 2014-05-27 11:30:35 +08:00
andyque b17de0cdcb add const to UILayout 2014-05-27 11:30:35 +08:00
andyque e32a637bf5 add const to ui framework methods 2014-05-27 11:30:35 +08:00
andyque 9cef55d62c issue #5176, refactor FocusNavigationController 2014-05-27 10:20:37 +08:00
andyque d8d5139aaf closed #5176, refactor UILayout and focus 2014-05-26 23:04:44 +08:00
andyque f32044fca9 closed #5176, fix FocusNavigationController 2014-05-26 18:38:03 +08:00
andyque 642969cc84 issue #5176, move setting setFirstFocsuedWidget to setFocused method 2014-05-26 18:27:06 +08:00
andyque 69d5b486af Revert "issue #5176, fix compile error on other platforms" 
This reverts commit 9118d7a98a.

Conflicts:
	cocos/ui/UIFocusManager.h
 2014-05-26 18:19:23 +08:00
andyque 1a6dba8656 issue #5176, refactor UIFocusManager 2014-05-26 18:17:47 +08:00
andyque cc8b70b87d issue #5176, refactor UIFocusManager and UIScrollView 2014-05-26 17:34:56 +08:00
andyque 9118d7a98a issue #5176, fix compile error on other platforms 2014-05-26 15:35:43 +08:00
andyque e866800044 issue #5176, refactor UICheckBox releaseUpEvent 2014-05-26 14:44:28 +08:00
andyque 40f2128acd Merge branch 'v3' into 5176 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/ui/UIPageView.cpp
	cocos/ui/UIScrollView.cpp
	cocos/ui/UIScrollView.h
 2014-05-26 14:00:23 +08:00
andyque 8112962778 issue #5183, remove in class member initialization 2014-05-26 09:51:05 +08:00
andyque 634fea7c45 Merge remote-tracking branch 'upstream/v3' into refactor5183 2014-05-26 09:18:32 +08:00
andyque d612518421 fix ui widget copyProperties issue 2014-05-23 15:03:46 +08:00
andyque 6d9a21d0ed issue #5176, add focus event listener to UIScrollView 2014-05-23 11:18:26 +08:00
andyque 3f363f0e51 issue #5176, add focus to UIScrollView 2014-05-23 10:59:18 +08:00
andyque 26be2708a0 issue #5176, refactor UIScrollView 2014-05-23 10:08:53 +08:00
andyque 65fe431eae issue #5176, fix a typo 2014-05-22 18:11:27 +08:00
andyque 1165ba8bc3 issue #5176, readd addChild methods into UIListView 2014-05-22 17:49:19 +08:00
andyque c8d9ab8122 issue #5176, refactor passTouchEventToParent method of UIWidget 2014-05-22 15:23:13 +08:00
hanbihui 76d0448b12 Update UILoadingBar.h Doxygen comments 2014-05-22 15:08:53 +08:00
andyque 4d82d8d26b issue #5176, rename UIScrollInterface to ScrollViewProtocol 2014-05-22 14:15:29 +08:00
andyque 2344928945 issue #5176, refactor AutoScrollDirection in UIPageView 2014-05-22 14:09:01 +08:00
andyque 0c065b4be0 issue #5176, refactor Layout and UIPageView 2014-05-22 13:51:44 +08:00
andyque ebcb7b78a3 issue #5176, refactor UIPageView 2014-05-22 11:43:02 +08:00
andyque e70a772c0f issue #5176, refactor UIPageView 2014-05-22 11:01:58 +08:00
andyque e88d91357b issue #5176, refacotr UIPageView 2014-05-22 11:01:58 +08:00
andyque 3b777646c4 issue #5176. fix UIScrollView 2014-05-22 11:01:58 +08:00
andyque e184ac9e0c issue #5176, refacotr UIPageView 2014-05-22 11:01:58 +08:00
andyque e9ff42064f issue #5176, remove unneeded functions in UIPageView 2014-05-22 11:01:58 +08:00
andyque d5e68e4803 issue #5176, fix override problems 2014-05-22 11:01:58 +08:00
andyque 0e8197b6ee issue #5176, add UIFocusManager 2014-05-22 11:01:58 +08:00
andyque d1df19794a fixed ui header file include problem 2014-05-22 10:49:28 +08:00
hanbihui 5547031e5c Update UILoadingBar.h doxygen comments 2014-05-21 16:35:47 +08:00
andyque dbd2de63b2 issue #5183, fix Layout visit issue 2014-05-21 15:21:55 +08:00
minggo 5a309fbc6e Merge pull request #6721 from zifter/FixNodeConst 
[ci skip]Getter always must be a const method.
 2014-05-21 09:48:27 +08:00
minggo dd428b527b Merge pull request #6843 from favorcode/v3 
[ci skip]Update UIImageView.h param name
 2014-05-20 17:34:56 +08:00
hanbihui 855b8a2784 Update UIImageView.h 
Update param name
 2014-05-20 16:45:09 +08:00
andyque 723e01f5df issue #5183, refactor UILayoutExecutant doLayout method 2014-05-20 16:09:30 +08:00
andyque 1ed9b9749e Revert "Merge pull request #6752 from andyque/refactorLayout" 
This reverts commit ae118a9d22, reversing
changes made to 6f2f2046c7.
 2014-05-20 14:36:29 +08:00
favorcode 5ed9e781e4 Update UIText.h 
Update the doxygen comment
 2014-05-20 13:05:20 +08:00
minggo ae118a9d22 Merge pull request #6752 from andyque/refactorLayout 
refactor Layout
 2014-05-20 12:07:04 +08:00
andyque 993b735392 closed #5183, done 2014-05-20 10:24:22 +08:00
andyque 432f688a67 issue #5183, refactor 2014-05-20 10:16:19 +08:00
andyque e0192e2a1b issue #5183, fix win32 compile error 2014-05-20 09:59:12 +08:00
andyque fe01d12a21 issue #5183, fix android compile error 2014-05-20 09:39:05 +08:00
andyque 28c3752641 issue #5183, refacotr some variable names 2014-05-20 09:36:17 +08:00
andyque 834a72315a issue #5183, add deprecated function for Widget 2014-05-19 17:43:27 +08:00
andyque a9e1c50897 issue #5183, refactor UIScrollView 2014-05-19 17:34:48 +08:00
andyque ee24e137f7 issue #5183, refactor obscure functions 2014-05-19 17:18:04 +08:00
andyque 121d6d3109 issue #5183, refactor 2014-05-19 16:51:25 +08:00
hyq 11dcf1e1dd fix UIText's fontSize 
if set fontsize before setting font family, fontsize was wrong
 2014-05-19 11:38:45 +08:00
zifter d875f27c67 Merge branch 'FixNodeConst' of https://github.com/zifter/cocos2d-x into FixNodeConst 
Conflicts:
	cocos/ui/UIListView.h
	cocos/ui/UIPageView.h
 2014-05-17 10:40:36 +03:00
andyque b434840bc9 issue #5183, add layout parameter type to widget for convenient access 2014-05-16 10:33:28 +08:00
andyque 1b3c28ea90 Merge branch 'v3' into refactorLayout 
Conflicts:
	cocos/ui/UILayout.cpp
 2014-05-16 10:22:53 +08:00
minggo 39d3d65157 Merge pull request #6754 from minggo/monkey-test 
Matrix -> Mat4
 2014-05-15 11:10:39 +08:00
minggo 67f809e223 Matrix -> Mat4 2014-05-15 11:09:17 +08:00
andyque cfa0342618 Merge branch 'v3' into issue5005 
Conflicts:
	cocos/ui/UIWidget.cpp
 2014-05-15 11:03:03 +08:00
andyque 3f08dd2758 issue #5183, remove no needed type 2014-05-15 10:48:33 +08:00
andyque b32ca246e7 issue #5183, done 2014-05-15 10:44:19 +08:00
andyque 5697d2417a issue #5183, done 2014-05-15 10:23:25 +08:00
andyque 0639e49031 issue #5183, add LayoutProtocol 2014-05-15 10:07:42 +08:00
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
andyque 967c071c68 issue #5183, refator LayoutExecutant 2014-05-14 18:24:23 +08:00
andyque 8c8f9611f7 issue #5183, add CCLayoutExecutant file 2014-05-14 18:03:44 +08:00
minggo db0ea94b8a Merge pull request #6730 from andyque/refactor5110 
refactor ui framework
 2014-05-14 17:47:47 +08:00
andyque 6cb3b47488 closed #5110, refactor 2014-05-14 17:07:24 +08:00
andyque 9d5c2ba773 closed #5110, add const specifier to getStringLength function 2014-05-14 16:25:30 +08:00
andyque 09fce798f0 closed #5110, add const reference to typedef 2014-05-14 16:14:28 +08:00
andyque 437b30487c issue #5110, refactor UITextBMFont 2014-05-14 16:02:31 +08:00
andyque 76cefcaa3f issue #5110, refactor UITextAtlas 2014-05-14 15:51:50 +08:00
andyque e6889dca36 issue #5110, refactor UIText 2014-05-14 15:26:14 +08:00
andyque 578ff2735d issue #5110, fix VideoPlayer android compile error 2014-05-14 14:44:04 +08:00
andyque 46cf6251b6 issue #5110, rename a member variable and delete gui prefix in ui tests 2014-05-14 11:26:04 +08:00
andyque e6a36fde18 issue #5110, refactor VideoPlayer 2014-05-14 11:18:11 +08:00
andyque 08801c035e issue #5110. refactor UILoadingBar, remove unneeded deprecats 2014-05-14 10:48:16 +08:00
andyque ca4a7a7e53 issue #4900, refactor 2014-05-14 09:55:55 +08:00
andyque 92d9120967 issue #4900, refactor 2014-05-14 09:37:21 +08:00
andyque df86b07f15 closed #5005, refactor 2014-05-14 09:23:56 +08:00
zifter 249dffa346 getter always must be a const method. 2014-05-13 23:28:04 +03:00
andyque a28bdb0ed5 closed #5005, refactor 2014-05-13 18:41:38 +08:00
andyque 2a25afbb76 closed #4900. add comment 2014-05-13 18:15:53 +08:00
andyque 31a2194dcb closed #4900, add TTF font to UIText 2014-05-13 17:45:15 +08:00
andyque 41fe56ee70 closed #5005, fix a null pointer exception 2014-05-13 17:12:48 +08:00
andyque 2d88c8ea92 closed #5005, fix visible and enable issue 2014-05-13 16:37:41 +08:00
andyque 1c47c833c6 issue #5005, fixed widget visit method 2014-05-13 14:56:44 +08:00
andyque 810c25b85e Merge branch 'v3' into issue5005 2014-05-13 14:52:49 +08:00
andyque 1a319b3f12 issue #5005, deprecated setTouchEnabled 2014-05-13 14:52:27 +08:00