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

20404 Commits

Author SHA1 Message Date
andyque 1165ba8bc3 issue #5176, readd addChild methods into UIListView 2014-05-22 17:49:19 +08:00
cocoscodeide 67e43e188a Merge pull request #25 from chuanweizhang2013/v3luaruntime 
add play ui
 2014-05-22 17:08:15 +08:00
garfield_ho d5d0df6933 The default size of CCMenu in CocosBuilder is 0,0 2014-05-22 16:21:51 +08:00
James Chen 7ea57e2804 Merge pull request #6873 from CocosRobot/update_lua_bindings_1400746052 
[AUTO]: updating luabinding automatically
 2014-05-22 03:21:17 -05:00
CocosRobot 0ab8624d2f [AUTO]: updating luabinding automatically 2014-05-22 08:08:54 +00:00
James Chen 1bead55e43 Merge pull request #6870 from samuele3hu/v3_fix 
Move `setSearchPath` operation from cpp to script for lua-tests
 2014-05-22 03:04:33 -05: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
heliclei 5e4f481ae5 capture this instead of reference in lambda 2014-05-22 14:52:19 +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
samuele3hu 5c869c1356 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-05-22 14:02:19 +08:00
samuele3hu a6efd4f650 Move `setSearchPat` operation from cpp to script 2014-05-22 14:00:39 +08:00
andyque 0c065b4be0 issue #5176, refactor Layout and UIPageView 2014-05-22 13:51:44 +08:00
James Chen 918a48054a Merge pull request #6867 from samuele3hu/v3_fix 
close #5255:Remove Sprite3D effect test
 2014-05-22 00:45:53 -05:00
James Chen 45cce2a692 Merge pull request #6869 from visiblelight/texturecache 
adding guard for the callback condition in `TextureCache::addImageAsyncCallBack`
 2014-05-22 00:38:00 -05: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
minggo 550f6fad37 Merge pull request #6868 from andyque/fixInclude 
fixed ui header file include problem
 2014-05-21 22:33:35 -05: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 57d5e6f2d5 issue #5176, add ListView focus test 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
samuele3hu 6c8e38871c issue #5255:Remove Sprite3D effect test 2014-05-22 10:22:10 +08:00
Sergey 4da8ad502f tests release/debug build 2014-05-21 21:13:44 +04:00
minggo b7cd118d52 [ci skip] 2014-05-21 18:35:14 +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
zhangbin d3d8c94c32 Update the reference of submodule cocos2d-console. 2014-05-21 17:48:46 +08:00
James Chen d4bebf7332 Merge pull request #6860 from CocosRobot/update_cocosfiles_1400657115 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-05-21 17:36:48 +08:00
hanbihui 5547031e5c Update UILoadingBar.h doxygen comments 2014-05-21 16:35:47 +08:00
hanbihui f79d779dc5 Merge pull request #1 from cocos2d/v3 
update code
 2014-05-21 16:34:13 +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
CocosRobot a07b2dae75 [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-21 07:25:16 +00:00
minggo 017b738f21 Merge pull request #6859 from andyque/fixLayoutVisit 
issue #5183, fix Layout visit issue
 2014-05-21 15:24:00 +08:00
andyque dbd2de63b2 issue #5183, fix Layout visit issue 2014-05-21 15:21:55 +08:00
minggo 64d316fa65 [ci skip] 2014-05-21 14:32:03 +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
minggo ae5f285a2a Merge pull request #6857 from Dhilan007/v3_labelfix 
issue #5277:Label:It could be possible that for using outline and invoking 'Director::setContentScaleFactor' cause label show nothing.
 2014-05-21 14:14:40 +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
minggo 7facea521c [ci skip] 2014-05-21 11:44:15 +08:00
minggo 4c6bbd55f6 Merge pull request #6856 from Dhilan007/v3_labelfix 
close issue#5277:Label:It could be possible that for using outline and invoking 'Director::setContentScaleFactor' cause label show nothing.
 2014-05-21 11:41:46 +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 dd21d27d59 [ci skip] 2014-05-21 11:24:23 +08:00