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

20344 Commits

Author SHA1 Message Date
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
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 20bae53f4a fixing typos 2014-05-26 16:32:13 +08:00
vision 28d30a5c40 fix a typo 2014-05-26 16:24:57 +08: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
James Chen 80e0ff6baa Merge pull request #6897 from CocosRobot/update_lua_bindings_1401083002 
[AUTO]: updating luabinding automatically
 2014-05-26 00:45:32 -05:00
CocosRobot 3245aeedd4 [AUTO]: updating luabinding automatically 2014-05-26 05:44:22 +00:00
James Chen 3c17427ce7 Merge pull request #6896 from CocosRobot/update_cocosfiles_1401082939 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-05-26 00:43:12 -05:00
vision 7edfe78f7d remove the parameter rect 2014-05-26 13:42:47 +08:00
CocosRobot cc41694077 [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-26 05:42:20 +00:00
minggo 75cb686573 Merge pull request #6894 from andyque/refactor5183 
refactor Layout, LayoutParameter and LayoutExecutant
 2014-05-26 00:41:04 -05:00
hanbihui 332f75a57c Update CCActionObject.h Doxygen comments 2014-05-26 12:02:14 +08:00
minggo 55baa62f96 [ci skip] 2014-05-25 22:34:21 -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
minggo 4ae9789826 Merge pull request #6883 from lmskater/remove-upload-apks 
[Jenkins][ci skip] Remove upload apks to another slave, just save it in local
 2014-05-25 21:13:49 -05:00
minggo 40181d10ef Merge pull request #6895 from CocosRobot/update_lua_bindings_1401069462 
[AUTO]: updating luabinding automatically
 2014-05-25 21:05:58 -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 b9819106b0 [ci skip] 2014-05-23 20:07:32 -05: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
minggo 7c7b1ce125 Merge pull request #6893 from cocoscodeide/v3 
update template project lua
 2014-05-23 07:37:27 -05:00
cocoscodeide 66e9b28426 Merge pull request #28 from chuanweizhang2013/v3luaruntime 
V3luaruntime
 2014-05-23 19:19:18 +08:00
cw c38f2bf92b 1.1.2 2014-05-23 19:17:43 +08:00
samuele3hu 006f082f74 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-05-23 19:15:46 +08:00
samuele3hu 3bd196f077 Update the openGL lua binding and related test case 2014-05-23 19:12:30 +08:00
cw 3727c14cb8 runtime 1.1.2 2014-05-23 18:26:36 +08:00