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 31 Tags 1.1 GiB
Commit Graph

20315 Commits

Author SHA1 Message Date
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
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
minggo 1b3a474646 Merge pull request #6891 from boyu0/3.1_test 
Roll back test_image_ar.pvr
 2014-05-23 04:25:56 -05:00
vision 66a33e7d93 no need to pass all the references 2014-05-23 17:21:46 +08:00
boyu0 80e184312a Roll back test_image_ar.pvr 2014-05-23 17:19:39 +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
minggo 515961517d Merge pull request #6886 from samuele3hu/v3_fix 
fix some bugs for lua-tests
 2014-05-23 03:54:16 -05:00
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