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

133 Commits

Author SHA1 Message Date
chuanweizhang2013 cee5754db4 modify mac out file 2014-06-25 19:33:38 +08:00
chuanweizhang2013 ec0eb7b6d6 modify filetime save formate 2014-06-25 11:36:59 +08:00
chuanweizhang2013 7f75b58acf Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime 
Conflicts:
	templates/lua-template-runtime/cocos-project-template.json
 2014-06-23 17:30:33 +08:00
chuanweizhang2013 a170342f01 modify release output 2014-06-23 16:56:23 +08:00
zhangbin dd49c4ccbc Solve the error in Xcode project of lua runtime template. 2014-06-23 15:41:58 +08:00
chuanweizhang2013 e1333da7e4 add stubs head 2014-06-23 15:07:49 +08:00
chuanweizhang2013 f283ec69a1 add head 2014-06-23 15:04:28 +08:00
chuanweizhang2013 a45056dbd7 add protobuf 2014-06-20 11:32:22 +08:00
minggo 7553060ba7 Merge pull request #7146 from gin0606/addNewLineAtTheEndOfFileCpp 
[ci skip]Add new line at the end of a file to *.[cpp|h]
 2014-06-19 20:47:17 +08:00
gin0606 bf4f30d14b Add new line at the end of a file to *.cpp 2014-06-19 20:45:24 +09:00
gin0606 2c837b0960 add new line at the end of a file to *.mk 2014-06-19 20:43:27 +09:00
chuanweizhang2013 9e62cc9c31 Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3luaruntime 2014-06-19 17:28:25 +08:00
chuanweizhang2013 be8775e314 Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3luaruntime 2014-06-19 17:23:36 +08:00
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
bofeng-song d97b28db76 modify copy script & modify release version`s outfile addr 2014-06-17 18:17:35 +08:00
Dhilan007 648e7767d4 fixed can't move app to SD card after installed on android. 2014-06-17 12:03:20 +08:00
bofeng-song 64f517a1b8 redirect function: setSearchPaths 2014-06-16 14:47:14 +08:00
bofeng-song b3fe030b90 Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3 2014-06-16 10:07:24 +08:00
bofeng-song bca578c2f8 fix can`t debug vs project normally 2014-06-13 16:34:39 +08:00
cocoscodeide 2d4297d14e Merge pull request #34 from cocos2d/v3 
merge from cocos2d-x
 2014-06-13 14:14:25 +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
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
minggo c5dd99edd1 Merge pull request #6911 from cocoscodeide/v3 
fixed win no log
 2014-05-27 18:43:10 +08:00
cw f2b243dff5 fixed win no log 2014-05-27 18:21:54 +08:00
minggo 866a1cb9aa Merge pull request #6820 from newnon/v3_android_improvements 
Android project improvements
 2014-05-27 10:17:03 +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 3727c14cb8 runtime 1.1.2 2014-05-23 18:26:36 +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
Sergey 49f26f3fbf lua template & android-build.py updated 2014-05-20 13:49:02 +04: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
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 859242c29b fixed portrait 2014-05-17 22:24:56 +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