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

155 Commits

Author SHA1 Message Date
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
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
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
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
chuanweizhang2013 1b3af4be19 move runtime res path 2014-05-22 22:08:04 +08:00
chuanweizhang2013 111840f37b add play ui 2014-05-22 11:52:49 +08:00
minggo 47482f8a3a Merge pull request #6825 from cocoscodeide/v3 
[ci skip] update template project lua
 2014-05-20 15:45:03 +08:00
cw 1aa92bdef0 add java nativeIsDebug 2014-05-20 13:53:52 +08:00
cw 84d66219c8 fixed android degbug 2014-05-20 11:44:46 +08:00
zhangbin 2b3f236792 Support generate release apk with prebuilt libs. 2014-05-20 10:47:27 +08:00
cocoscodeide a2be97380b Merge pull request #14 from bofeng-song/v3 
show uploading file in play scene
 2014-05-19 13:35:31 +08:00
cw defd10da72 modiy size 2014-05-17 22:46:09 +08:00
cw 859242c29b fixed portrait 2014-05-17 22:24:56 +08:00
cw c7591511f7 fixed version num 2014-05-17 19:38:15 +08:00
cw 150125f411 fixed mac relaunch bug 2014-05-17 19:11:12 +08:00
cw 8db2882431 fixed head search path 2014-05-17 14:41:03 +08:00
cw 84e9cd3a77 modify vec2 2014-05-17 11:35:57 +08:00
bofeng-song 6a8712482c fix build error 2014-05-17 11:30:07 +08:00
Ricardo Quesada 0f67247325 Squashed commit of the following: 
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 14:33:49 2014 -0700

    Yeah... everything compiles on win32 and wp8

commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 13:58:38 2014 -0700

    CCIME moved to base

    and compiles on Android

commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 13:02:57 2014 -0700

    compiles Ok for Windows Phone 8

commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 12:25:31 2014 -0700

    fixes for Windows Phone 8

commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 11:15:13 2014 -0700

    Compiles on Win32

commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 10:08:31 2014 -0700

    Compiles on linux!

commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 09:30:42 2014 -0700

    moves cocos/2d/platform -> cocos/platform

commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 08:24:41 2014 -0700

    Merge remote-tracking branch 'cocos2d/v3' into files

commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu May 15 19:36:23 2014 -0700

    files in the correct directory
 2014-05-16 14:36:00 -07:00
minggo bf2250a67a Merge pull request #6738 from cocoscodeide/v3 
update template project lua
 2014-05-16 18:10:10 +08:00
bofeng-song 6dd7f2d630 Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3 2014-05-16 17:19:36 +08:00
cw aa2aa4bcdf fixed repo 2014-05-16 17:08:33 +08:00
bofeng-song 662d8454f7 remove inner function from header file 2014-05-16 16:46:35 +08:00
bofeng-song 5cf961912b fix potential problem 2014-05-16 16:24:26 +08:00
bofeng-song 8a407cd0ba show uploading file in play scene 2014-05-16 15:59:09 +08:00
Jason Xu 67a558c83d for 93562d6aa6 
update Cocos2dxHelper and AndroidManifest.xml template.
 2014-05-16 15:55:00 +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