Commit Graph

20217 Commits

Author SHA1 Message Date
minggo ba7c2cc133 Merge pull request #6906 from CocosRobot/update_lua_bindings_1401172218
[AUTO]: updating luabinding automatically
2014-05-27 14:40:43 +08:00
CocosRobot e1ab346e70 [AUTO]: updating luabinding automatically 2014-05-27 06:31:18 +00:00
minggo 9d90f53018 Merge pull request #6905 from samuele3hu/v3_fix
Update submodule
2014-05-27 14:27:47 +08:00
samuele3hu b6cc477832 Update submodule 2014-05-27 14:25:18 +08:00
minggo 63680946ee Merge pull request #6841 from shujunqiao/reboot
[ci skip], add reboot.py in jenkins-scripts.
2014-05-27 14:08:25 +08:00
minggo c476e784fa Merge pull request #6816 from shujunqiao/request-build-modify
[ci skip], modify request proxies in post-build.py and so on.
2014-05-27 14:04:37 +08:00
minggo 034e2c6f75 Merge pull request #6809 from heliclei/autotest-stop
Support autotest stop command
2014-05-27 14:01:38 +08:00
minggo 9d2c765fc0 Merge pull request #6862 from favorcode/v3
Update UILoadingBar.h doxygen comments
2014-05-27 13:54:52 +08:00
minggo f44b9ed6c8 Merge pull request #6899 from samuele3hu/v3_fix
Update submodule
2014-05-27 13:51:02 +08:00
minggo 23da27453d Merge pull request #6904 from andyque/refactorUIFramework
refactor Layout and Widget
2014-05-27 13:49:53 +08:00
andyque df13d4033c refactor Layout and Widget 2014-05-27 13:49:00 +08:00
minggo 02e2957bf6 Merge pull request #6903 from andyque/addConstness
add constness to ui framework
2014-05-27 11:50:39 +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
minggo a01315e2f5 Merge pull request #6726 from visiblelight/screenshot
Add a new utility function to snap the screen
2014-05-27 11:18:25 +08:00
vision bfd945c592 remove unused variables 2014-05-27 10:47:25 +08:00
vision 363fd8dc2a move the capturen screen interface from Director to ccUtils 2014-05-27 10:44:23 +08:00
minggo f88c221861 [ci skip] 2014-05-27 10:42:56 +08:00
minggo 626e0acb9d Merge pull request #6848 from newnon/v3_android_jni_improvements
android jni error clear & more readable log
2014-05-27 10:40:59 +08:00
minggo f7450730fb Merge pull request #6901 from andyque/fixDpadNavigation
issue #5176, refactor FocusNavigationController
2014-05-27 10:40:00 +08:00
minggo 37d381b000 Merge pull request #6900 from CocosRobot/update_lua_bindings_1401156837
[AUTO]: updating luabinding automatically
2014-05-27 10:22:13 +08:00
minggo 362a1efd46 Merge pull request #6902 from CocosRobot/update_lua_bindings_1401157203
[AUTO]: updating luabinding automatically
2014-05-27 10:21:58 +08:00
CocosRobot 9e9cab9e53 [AUTO]: updating luabinding automatically 2014-05-27 02:21:22 +00:00
minggo 4b072ee1d3 [ci skip] 2014-05-27 10:20:50 +08:00
andyque 9cef55d62c issue #5176, refactor FocusNavigationController 2014-05-27 10:20:37 +08:00
minggo 053da338bb [ci skip] 2014-05-27 10:18:29 +08:00
minggo 866a1cb9aa Merge pull request #6820 from newnon/v3_android_improvements
Android project improvements
2014-05-27 10:17:03 +08:00
CocosRobot 74db4fe477 [AUTO]: updating luabinding automatically 2014-05-27 02:15:33 +00:00
minggo 94a1013f75 Merge pull request #6898 from andyque/5176
add FocusManager, refactor UI framework
2014-05-27 10:09:43 +08:00
andyque d8d5139aaf closed #5176, refactor UILayout and focus 2014-05-26 23:04:44 +08:00
vision c72ae9e3c5 merge from the latest v3 2014-05-26 20:18:11 +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
samuele3hu 270ddf0354 Update submodule 2014-05-26 18:25:23 +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
vision f40f0e0bb9 more define check 2014-05-26 17:00:31 +08:00