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

20100 Commits

Author SHA1 Message Date
chuanweizhang2013 1153531448 add response error 2014-06-19 16:50:16 +08:00
chuanweizhang2013 e1d7871089 add mac android support 2014-06-19 11:27:31 +08:00
chuanweizhang2013 69a55e2cfa add protobuf-lite source 2014-06-18 15:43:38 +08:00
chuanweizhang2013 2eac73cde3 add protobuf win32 2014-06-13 11:19:04 +08:00
chuanweizhang2013 ddaf8f9ec5 modify play action 2014-06-06 16:24:09 +08:00
chuanweizhang2013 f9b747cf1f modify runtime 2014-06-05 18:03:38 +08:00
cw 9d14a179db Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime 2014-06-03 11:28:18 +08:00
cw 521fa3118d config template 2014-06-03 11:25:16 +08:00
chuanweizhang2013 72ce393d60 remove rtres floder 2014-05-30 14:25:37 +08:00
cw 3807c7cffc resource to binary 2014-05-30 13:53:49 +08:00
chuanweizhang2013 4b812f8b80 modify runtime folder 2014-05-30 11:00:26 +08:00
chuanweizhang2013 29cc2905f4 add tip 2014-05-30 09:43:39 +08:00
chuanweizhang2013 188f4ddcca Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3luaruntime 2014-05-29 18:19:30 +08:00
chuanweizhang2013 201900e110 action 2014-05-29 18:19:19 +08:00
cocoscodeide 672ff4f7b3 Merge pull request #29 from bofeng-song/v3 
add lock to get file name
 2014-05-29 18:17:57 +08:00
cocoscodeide 7c197ab69b Merge pull request #30 from chuanweizhang2013/v3luaruntime 
fixed win no log
 2014-05-27 18:26:43 +08:00
cw f2b243dff5 fixed win no log 2014-05-27 18:21:54 +08:00
bofeng-song 3aa7f7b504 show tips while launch app 2014-05-27 02:26:47 +08:00
bofeng-song ba6348c35d add lock to get file name 2014-05-27 01:21:57 +08:00
bofeng-song 517ab063fb Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3 2014-05-23 19:22:14 +08: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
cw 3727c14cb8 runtime 1.1.2 2014-05-23 18:26:36 +08:00
cw ca68a273e3 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime 2014-05-23 16:38:03 +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
bofeng-song b44628f335 Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3 2014-05-23 13:43:55 +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
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
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
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
bofeng-song 6f1404ec46 Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3 2014-05-22 18:28:02 +08:00
cocoscodeide 67e43e188a Merge pull request #25 from chuanweizhang2013/v3luaruntime 
add play ui
 2014-05-22 17:08:15 +08:00
bofeng-song e31b03ab2e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-05-22 17:01:41 +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