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

40 Commits

Author SHA1 Message Date
Wenhai Lin b87b46a3d2 Disable the CDT builder of cpp-template-defualt 2015-04-08 16:29:10 +08:00
minggo 058668711b fix conflict 2015-02-13 16:44:14 +08:00
kompjoefriek c0c55f885e Removed trailing spaces 2015-02-12 22:38:07 +01:00
kompjoefriek c6ab07ea02 fixed indentation of Python files 
- Changed tabs to spaces
- Changed 2 spaces to 4 spaces
 2015-02-12 21:22:19 +01:00
WenhaiLin 2c728fa341 Fixed can't run new CPP project on android by Eclipse 2015-01-09 15:01:08 +08:00
dualface c041787f01 update proj.android for template 2015-01-09 04:14:31 +08:00
minggo a1e8dec384 use cocos console in build_native.py and android-build.py 2014-12-30 16:24:16 +08:00
Dhilan007 3025e937f6 Fixed compiling and linking error of new lua projects when using NDK r10 above. 2014-11-27 21:56:06 +08:00
Filipe Lemos b722df671b Fix CPU check on android template 2014-11-26 11:02:22 +00:00
Christopher O'Connell 5d26bc045c Fixed failure in call to make when the android app folder contains spaces in the path. 2014-11-10 00:38:32 -07:00
NeoLeeee a5a16eecbf the android library path is wrong 
if you run the following command in your game forder 

cocos run -p android

it will give you the following error since the path is wrong

BUILD FAILED
/Users/lifeng/dev/adt_bundle_mac/sdk/tools/ant/build.xml:459: ../../../cocos/platform/android/java resolve to a path with no project.properties file for project /Users/lifeng/study/cosco2dx/MyFirstGame/proj.android
 2014-10-10 01:33:41 +08:00
minggo 3873bbc5f7 Merge pull request #8060 from giuslape/v3 
Update Reference plugin-x
 2014-10-08 09:39:45 +08:00
Giuseppe Lapenta 3c76e6fecd Update Reference for template 2014-09-15 17:55:39 +02:00
zhangbin 0f62ac19c0 Modify the config file in template for the folder rename. 2014-09-15 13:56:15 +08:00
minggo a9232a14ea res->Resources src->Classes for cpp template 2014-09-13 17:50:02 +08:00
minggo b37ef4e1c3 remove unneeded files 2014-09-03 11:52:19 +08:00
zhangbin e24a903c88 Solve the problem: gdbserver is not copied to directory proj.android/libs when ndk-build with NDK_DEBUG=1. 2014-08-28 16:13:11 +08:00
samuele3hu a3e4402c5f Adjust cpp-template-default template 2014-08-22 13:50:28 +08:00
samuele3hu 22a48fb760 Update cpp and lua template to support cocos3d lib 2014-08-18 19:23:03 +08:00
samuele3hu 76a9382a91 Rename folder names of cpp-template: ‘Classes’—>’src’ ,’Resource’—>’res’ and adjust the template project except wp8 2014-08-15 00:08:15 +08:00
陈广歧 5063ec465b Fixed error for importing project 
fixed error for importing android project to Eclipse

```
The import org.cocos2dx.lib cannot be resolved ...
```
 2014-07-19 19:35:30 +08:00
minggo d8c9f6a0a6 add regular support in Node::enumerateChildren() 2014-07-02 17:07:36 +08:00
gin0606 2c837b0960 add new line at the end of a file to *.mk 2014-06-19 20:43:27 +09:00
Dhilan007 648e7767d4 fixed can't move app to SD card after installed on android. 2014-06-17 12:03:20 +08:00
Sergey 1ff2a03d16 debug mode by default 
configuration switched to -b debug/release
 2014-05-20 13:00:21 +04:00
Sergey a489c19535 Android project improvements 
(release/debug builds)
native debug support
 2014-05-19 17:47:17 +04:00
Huabing.Xu 94228df977 fix cpp_template 2014-05-18 18:04:12 -07: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
Jason Xu 67a558c83d for 93562d6aa6 
update Cocos2dxHelper and AndroidManifest.xml template.
 2014-05-16 15:55:00 +08:00
minggo 4356727465 Merge pull request #6619 from myourys/v3 
update cpp-default-template for android *Eclipse*
 2014-05-13 13:52:28 +08:00
minggo 8dba4e3b13 Merge pull request #6570 from gin0606/buildNativeVariableArguments 
Upgrade build_native.py to take variable number of arguments
 2014-05-08 13:59:16 +08:00
Hector 420439cdea update cpp-default-template for android *Eclipse* 2014-05-08 11:20:25 +08:00
minggo 21aa7058e3 := -> += 2014-05-07 14:35:43 +08:00
minggo 976ef3e2a4 add some comment for dependences module in Android.mk to make it simple to use other module 2014-05-07 14:31:05 +08:00
gin0606 dd8d932c0a Upgrade build_native.py to take variable number of arguments 2014-05-05 12:48:51 +09:00
James Chen 8cbcf17163 issue #4674: Re-added deleted source files. 2014-05-04 14:37:55 +08:00
Ricardo Quesada 32f3fedb37 Moves cocos/2d/Android.mk to cocos/Android.mk 
Easier to find Android.mk
 2014-05-01 14:09:26 -07:00
Dhilan007 c642d4d4c4 update templates for remove native activity 2014-03-25 15:43:42 +08:00
minggo 656211a72f add description for how to load .so 2014-03-12 21:28:38 +08:00
James Chen 33a5be526c Removes unused templates. 2014-03-04 09:46:32 +08:00