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

277 Commits

Author SHA1 Message Date
Ricardo Quesada 59b966731e Compiles on Windows and Android 2014-06-04 09:48:35 -07:00
Ricardo Quesada 79ebc546f8 Merge remote-tracking branch 'cocos2d/v3' into normalized_position 
Conflicts:
	CHANGELOG
	cocos/ui/UILayout.cpp
 2014-06-04 09:19:22 -07:00
andyque d089b251db fix other platform compile error 2014-06-04 14:56:34 +08:00
andyque 38e274de73 refact ui header file include 2014-06-04 14:56:33 +08:00
andyque c6cb3a56fb refactor ListView, add do Layout 2014-06-04 10:51:32 +08:00
andyque 652c214374 remove sortChildren of Layout 2014-06-04 10:10:50 +08:00
Ricardo Quesada 449b588400 Compiles on iOS 2014-06-02 16:02:54 -07:00
Ricardo Quesada 1b8d0d88df Adds setNormalizedPosition() 
Changes in `visit()` were done in order to do it
in a robust and fast way.
 2014-05-30 16:42:05 -07:00
andyque 769300d25e rename UILayout 
Executant.h to UILayoutManager.h
 2014-05-28 10:17:34 +08:00
andyque c5a118ee1b refactor UILayoutExecutant to LayoutManager 2014-05-28 10:11:49 +08:00
minggo 9d2c765fc0 Merge pull request #6862 from favorcode/v3 
Update UILoadingBar.h doxygen comments
 2014-05-27 13:54:52 +08:00
andyque df13d4033c refactor Layout and Widget 2014-05-27 13:49:00 +08:00
andyque 30582ffa6f add constness to UIPageView's removeAllPages method 2014-05-27 11:30:37 +08:00
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