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

19664 Commits

Author SHA1 Message Date
cocoscodeide f1bd396140 Merge pull request #13 from chuanweizhang2013/v3luaruntime 
add prebuiltruntime
 2014-05-16 12:03:57 +08:00
cw ceeba9a081 mofiy size 2014-05-16 12:02:59 +08:00
cw 48e437801f add prebuiltruntime 2014-05-16 11:57:03 +08:00
cocoscodeide bad30e4b66 Merge pull request #12 from bofeng-song/v3 
add support for reverse orientation for android
 2014-05-15 18:07:14 +08:00
bofeng-song c0297c6e5f add support for reverse orientation for android 2014-05-15 17:58:23 +08:00
cocoscodeide eb00d7816c Merge pull request #11 from chuanweizhang2013/v3luaruntime 
set macox deployment target
 2014-05-15 17:13:13 +08:00
cw 82f08513b0 set macox deployment target 2014-05-15 17:07:14 +08:00
cocoscodeide 53a7521c36 Merge pull request #10 from chuanweizhang2013/v3luaruntime 
fixed warnging
 2014-05-15 11:49:28 +08:00
cw a7c0a44792 fixed warnging 2014-05-15 11:34:17 +08:00
cocoscodeide 772d22b6fc Merge pull request #9 from chuanweizhang2013/v3luaruntime 
V3luaruntime
 2014-05-14 18:06:19 +08:00
cw b42eb08bad fixed error 2014-05-14 18:01:38 +08:00
cocoscodeide 747f28c2e1 Merge pull request #8 from bofeng-song/v3 
fix build err
 2014-05-14 15:55:55 +08:00
bofeng-song d0d20e7272 fix build err 2014-05-14 15:52:58 +08:00
cw 7c8e237ee2 Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3luaruntime 2014-05-14 15:11:59 +08:00
cocoscodeide fe7774947d Merge pull request #7 from bofeng-song/v3 
support custom orientation for android
 2014-05-14 15:10:10 +08:00
cw 501762f3b5 remove post-new.py 2014-05-14 15:03:32 +08:00
bofeng-song 668ed34512 Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3 2014-05-14 15:03:07 +08:00
bofeng-song 20346d8ef6 lua runtime, support custom orientation 2014-05-14 15:02:24 +08:00
cocoscodeide 83c4063570 Merge pull request #6 from chuanweizhang2013/v3luaruntime 
modify andorid orientation
 2014-05-14 15:02:03 +08:00
cw e0fe2cb2e2 modify android orientation 2014-05-14 14:58:36 +08:00
cw cc5ba9b2b1 modify android orientation 2014-05-14 14:40:27 +08:00
bofeng-song 11f28c47cb Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3 2014-05-13 18:35:18 +08:00
bofeng-song 47bc17eac2 Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3 2014-05-13 18:33:08 +08:00
cw d9543e9371 fixed mistake 2014-05-13 18:15:25 +08:00
bofeng-song b19a5b2feb Merge branch 'v3' of https://github.com/bofeng-song/cocos2d-x into v3 2014-05-13 18:07:08 +08:00
cw 3207d841a3 Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3luaruntime 2014-05-13 18:01:38 +08:00
cocoscodeide 0b301d6602 Merge pull request #5 from cocos2d/v3 
update cocos2d-x
 2014-05-13 17:59:18 +08:00
chuanweizhang2013 21483b1a47 add start search config.json 2014-05-13 17:44:35 +08:00
cocoscodeide a300194d8f Merge pull request #4 from chuanweizhang2013/v3luaruntime 
V3luaruntime
 2014-05-13 16:03:12 +08:00
chuanweizhang2013 f35d69805f Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime 2014-05-13 15:57:24 +08:00
chuanweizhang2013 c8d871a60b modify read config time 2014-05-13 15:56:39 +08:00
chuanweizhang2013 4518185a7b modify read config time 2014-05-13 15:30:55 +08:00
minggo f36f224d46 Merge pull request #6710 from natural-law/v3 
Modify the lua runtime template for the implementation of downloading runtime files.
 2014-05-13 15:25:34 +08:00
Ricardo Quesada cd194cad9f Merge pull request #6711 from ricardoquesada/indent_issues 
fixes more indentation issues
 2014-05-13 00:10:30 -07:00
Ricardo Quesada 8aea6fe89f fixes more indentation issues 2014-05-13 00:10:01 -07:00
zhangbin b0adc6fe51 Modify the lua runtime template for the implementation of downloading runtime files. 2014-05-13 15:06:56 +08:00
James Chen 58fd1a05b3 Merge pull request #6709 from CocosRobot/update_lua_bindings_1399964508 
[AUTO]: updating luabinding automatically
 2014-05-13 15:05:30 +08:00
CocosRobot 7ad48b632a [AUTO]: updating luabinding automatically 2014-05-13 07:03:12 +00:00
Ricardo Quesada b456701451 Merge pull request #6708 from ricardoquesada/multitexturingsupport 
Multi texturing support
 2014-05-12 23:58:10 -07:00
Ricardo Quesada f25de7869b indentation issues 2014-05-12 23:57:46 -07:00
Ricardo Quesada cdac920b5f Merge remote-tracking branch 'cocos2d/v3' into multitexturingsupport 2014-05-12 23:52:02 -07:00
Ricardo Quesada 71848aca93 Initial multitexturing support 2014-05-12 23:51:37 -07:00
James Chen 7cf54c4e1f Merge pull request #6704 from dumganhar/make-package-support-insert-extra-zip 
Adds a comment before making archive file
 2014-05-13 14:38:50 +08:00
James Chen 45d845f559 Adds a comment before making archive file 2014-05-13 14:33:53 +08:00
James Chen f85446b8ec Merge pull request #6702 from dumganhar/make-package-support-insert-extra-zip 
[ci skip] The tool of making package supports to insert the content of another zip file
 2014-05-13 14:30:51 +08:00
James Chen 4f886e8ebf [ci skip] The tool of making package supports to insert the content of 
another zip file
 2014-05-13 14:28:29 +08:00
chuanweizhang2013 1c0968bbc4 Merge pull request #27 from cocoscodeide/v3 
update cocos2d-x
 2014-05-13 14:25:02 +08:00
bofeng-song e1ec7a9377 Merge pull request #1 from cocoscodeide/v3 
meger ide
 2014-05-13 13:58:02 +08:00
minggo 4bb9fb2396 [ci skip] 2014-05-13 13:56:42 +08:00
minggo a75550aaba [ci skip] 2014-05-13 13:55:29 +08:00