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

3990 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
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
hanbihui 332f75a57c Update CCActionObject.h Doxygen comments 2014-05-26 12:02:14 +08: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
CocosRobot 293ced84c2 [AUTO]: updating luabinding automatically 2014-05-23 03:12:39 +00: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
Ricardo Quesada 5601048829 Fixes compiler warnings for mac and ios 2014-05-22 16:34:16 -03:00
vision e263c5f2de use shared_ptr for better readibility 2014-05-22 23:34:27 +08:00
Sachin Garg eec7a81b02 Set jpeg save quality to 90 (default is only 75, on a scale of 0 to 100). 2014-05-22 16:24:29 +05:30
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
garfield_ho d5d0df6933 The default size of CCMenu in CocosBuilder is 0,0 2014-05-22 16:21:51 +08:00
CocosRobot 0ab8624d2f [AUTO]: updating luabinding automatically 2014-05-22 08:08:54 +00: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
Ishiguro Yusuke 90cea76008 Fix Repeat will run one more over in rare situations 2014-05-22 15:59:47 +09: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
vision a68515dbff adding guard for the callback condition 2014-05-22 12:42:52 +08:00
chuanweizhang2013 111840f37b add play ui 2014-05-22 11:52:49 +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
minggo cda9183e01 Merge pull request #6861 from boyu0/bug4944_physics_crash 
closed #4944: fixed bug: physics engine crashes occasionally when remove...
 2014-05-21 18:32:19 +08:00
hanbihui 5547031e5c Update UILoadingBar.h doxygen comments 2014-05-21 16:35:47 +08:00
boyu0 b6274a469d closed #4944: fixed bug: physics engine crashes occasionally when remove bodies at physics contact callback. 2014-05-21 16:07:49 +08:00
andyque dbd2de63b2 issue #5183, fix Layout visit issue 2014-05-21 15:21:55 +08:00
minggo 3b5417a325 Merge pull request #6854 from MSOpenTech/wp8-v3-fix 
Wp8 v3 fix for precompiled shaders and precompiled headers
 2014-05-21 14:31:18 +08:00
Dhilan007 d13ed93fc1 issue #5277:Label:It could be possible that for using outline and invoking 'Director::setContentScaleFactor' cause label show nothing. 2014-05-21 14:08:30 +08:00
Dhilan007 ac258439b0 close issue#5277:Label:It could be possible that for using outline and invoking 'Director::setContentScaleFactor' cause label show nothing. 2014-05-21 11:38:45 +08:00
minggo 40df6a28a2 Merge pull request #6844 from Dhilan007/v3-labelfix 
closed issue#5252:Label:It could be possible that for using outline cause crash.
 2014-05-21 11:19:12 +08:00
Dhilan007 70346c4437 Merge branch 'v3_wp8fix' of https://github.com/Dhilan007/cocos2d-x into v3-wp8 2014-05-21 10:44:48 +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
Dale Stammen 2a7b223b5b updated link() for wp8 2014-05-20 11:47:33 -07:00
Dale Stammen 3971666426 updated pch file for wp8 2014-05-20 10:06:24 -07:00
Dale Stammen c0798a3c0a updated precompiled shaders for wp8 2014-05-20 10:06:02 -07:00
Dale Stammen f0e4c97bc6 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into wp8-v3-fix 2014-05-20 07:50:12 -07:00
Dale Stammen 3db6856d27 added missing pch files for WP8 2014-05-20 07:48:42 -07:00
Dale Stammen 0efc070104 fixed shader compiler after cocos refactor 2014-05-20 07:48:12 -07:00
CocosRobot f734cc3f7b [AUTO]: updating luabinding automatically 2014-05-20 11:46:42 +00:00
Sergey cd892abc77 android uni error clear & more readable log 2014-05-20 14:52:21 +04:00
samuele3hu a2ebe428da Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-05-20 18:11:28 +08:00
samuele3hu 2d65f9bc6f issue #5255:Add Sprite3D test cases for Lua 2014-05-20 18:09:04 +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
Dhilan007 55c1319426 closed issue#5252:Label:It could be possible that for using outline cause crash. 2014-05-20 16:54:51 +08:00
hanbihui 855b8a2784 Update UIImageView.h 
Update param name
 2014-05-20 16:45:09 +08:00
andyque 480c8cfe8f Merge branch 'fix_revert_pr' into refactor5183 2014-05-20 16:17:38 +08:00
andyque b07e82f7c3 Revert "Revert "Merge pull request #6752 from andyque/refactorLayout"" 
This reverts commit 1ed9b9749e.
 2014-05-20 16:17:10 +08:00
andyque 723e01f5df issue #5183, refactor UILayoutExecutant doLayout method 2014-05-20 16:09:30 +08:00
minggo 9a276c66a0 Merge pull request #6740 from zifter/FixProgressTo 
Fix Progress Action. Not working with charging from 100 to 0.
 2014-05-20 15:36:10 +08:00
CocosRobot 33d8973277 [AUTO]: updating luabinding automatically 2014-05-20 06:44:06 +00: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
minggo 9cf21f9a6a Merge pull request #6829 from favorcode/v3 
[ci skip]Update UIText.h doxygen comments
 2014-05-20 14:03:19 +08:00
favorcode 5ed9e781e4 Update UIText.h 
Update the doxygen comment
 2014-05-20 13:05:20 +08:00
CocosRobot 2c47eae1a0 [AUTO]: updating luabinding automatically 2014-05-20 04:10:28 +00:00