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

3940 Commits

Author SHA1 Message Date
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 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
CocosRobot 9e9cab9e53 [AUTO]: updating luabinding automatically 2014-05-27 02:21:22 +00:00
andyque 9cef55d62c issue #5176, refactor FocusNavigationController 2014-05-27 10:20:37 +08: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
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
minggo f619c096da Merge pull request #6874 from HoGarfield/CCMenuLoader_v3 
The default size of CCMenu in CocosBuilder is 0,0
 2014-05-26 03:34:13 -05:00
vision bb4ce31644 new empty line appended to the file end 2014-05-26 16:15:30 +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
vision 21f7e34d18 remove unused variables 2014-05-26 13:49:00 +08:00
CocosRobot 3245aeedd4 [AUTO]: updating luabinding automatically 2014-05-26 05:44:22 +00:00
vision 7edfe78f7d remove the parameter rect 2014-05-26 13:42:47 +08:00
minggo 75cb686573 Merge pull request #6894 from andyque/refactor5183 
refactor Layout, LayoutParameter and LayoutExecutant
 2014-05-26 00:41:04 -05:00
minggo 32964de7c5 Merge pull request #6877 from sachingarg05/BetterJpegSaveQuality 
[ci skip]Set jpeg save quality to 90 (default is only 75, on a scale of 0 to 100)
 2014-05-25 22:30:26 -05:00
CocosRobot bff5fdfdda [AUTO]: updating luabinding automatically 2014-05-26 01:58:46 +00:00
minggo f29654ff6c Merge pull request #6890 from visiblelight/FixTextureCache 
Fix the crash in TextureAsync test
 2014-05-25 20:55:13 -05: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
minggo 399571f542 Merge pull request #6892 from samuele3hu/v3_fix 
Update the OpenGL lua binding and related test case
 2014-05-23 07:37:49 -05:00
samuele3hu 3bd196f077 Update the openGL lua binding and related test case 2014-05-23 19:12:30 +08:00
vision e2ce876260 remove new lines 2014-05-23 18:01:17 +08:00
vision ffdf3d7b67 assure threading safety 2014-05-23 17:59:34 +08:00
vision fb6ea21ca8 assure threading safety 2014-05-23 17:49:25 +08:00
vision e3a365ad60 assure threading safety 2014-05-23 17:48:07 +08:00
vision 8128bfce68 check the condition guard 2014-05-23 17:27:59 +08:00
vision 66a33e7d93 no need to pass all the references 2014-05-23 17:21:46 +08:00
vision 910099fbe5 add new interfaces for TextureCache to unbind the bound image asynchronous load callbacks. 2014-05-23 17:08:22 +08:00
cw ca68a273e3 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime 2014-05-23 16:38:03 +08:00
andyque d612518421 fix ui widget copyProperties issue 2014-05-23 15:03:46 +08:00
minggo 6539b558bd update version 2014-05-23 14:30:08 +08:00
cocoscodeide 5e198aaae2 Merge pull request #26 from cocos2d/v3 
update cocos2d-x
 2014-05-23 12:46:42 +08:00
andyque 6d9a21d0ed issue #5176, add focus event listener to UIScrollView 2014-05-23 11:18:26 +08:00