Commit Graph

20434 Commits

Author SHA1 Message Date
samuele3hu d9ac8865f9 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-05-23 16:49:25 +08:00
samuele3hu dc03571076 fix some bugs for lua-tests 2014-05-23 16:48:18 +08:00
cw ca68a273e3 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime 2014-05-23 16:38:03 +08:00
lm 4328072f7b [Jenkins][ci skip] Remove unavailable parameter in android building 2014-05-23 16:06:46 +08:00
minggo 99bfa9ffe8 [ci skip] 2014-05-23 02:13:58 -05:00
minggo 1059c0df03 Merge pull request #6885 from andyque/fixCopyProperties
fix ui widget copyProperties issue
2014-05-23 02:12:39 -05:00
andyque d612518421 fix ui widget copyProperties issue 2014-05-23 15:03:46 +08:00
minggo 82c746cc62 Merge pull request #6884 from minggo/v3
update version
2014-05-23 01:33:54 -05:00
minggo 6539b558bd update version 2014-05-23 14:30:08 +08:00
lm 209c1d884a [Jenkins][ci skip] Remove upload apks to another slave, just save it in local 2014-05-23 14:02:31 +08:00
chuanweizhang2013 c1dfafa85b Merge pull request #28 from cocoscodeide/v3
update cocos2d-x
2014-05-23 00:43:20 -05:00
cocoscodeide 58ed156cec Merge pull request #27 from chuanweizhang2013/v3luaruntime
move runtime res path
2014-05-23 13:38:47 +08:00
cocoscodeide 5e198aaae2 Merge pull request #26 from cocos2d/v3
update cocos2d-x
2014-05-23 12:46:42 +08:00
minggo 5c49217956 Merge pull request #6882 from CocosRobot/update_lua_bindings_1400814673
[AUTO]: updating luabinding automatically
2014-05-22 22:24:46 -05: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
minggo e7d3d7ad94 Merge pull request #6881 from samuele3hu/v3_fix
Readd the lua binding for `visit` and modify a requirement for IDE
2014-05-22 22:08:30 -05: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
samuele3hu f76e2a5476 Readd the lua binding for `visit` and modify a requirement for IDE 2014-05-23 10:00:59 +08:00
minggo 6e76ca7945 Merge pull request #6864 from natural-law/v3
Update the reference of submodule cocos2d-console.
2014-05-22 20:32:13 -05:00
minggo 523d136cc5 [ci skip] 2014-05-22 20:30:06 -05:00
minggo 8a836bb49f Merge pull request #6878 from MSOpenTech/wp8-v3-fix
updated WP8 cpp template file
2014-05-22 20:28:50 -05:00
Ricardo Quesada 187ebcfd57 Merge pull request #6879 from ricardoquesada/warnings_fixes
Fixes compiler warnings for mac and ios
2014-05-22 16:34:58 -03: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
chuanweizhang2013 1b3af4be19 move runtime res path 2014-05-22 22:08:04 +08:00
Dale Stammen f3eb0d7722 updated cpp template file 2014-05-22 06:58:05 -07: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
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