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

20 Commits

Author SHA1 Message Date
zilongshanren b879dce607 add audio SimpleAudioEngine.h search path back 2016-03-28 14:35:59 +08:00
Ricardo Quesada 028f8c28e1 Squashed commit of the following: 
commit 59e43a3c80f4af8998e4a14f6463bd7a91617d5f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Mar 2 15:19:48 2016 -0800

    uses new naming convention for projects

    uses _ instead of -

commit f97ba56608d48b17909649c8617ba9047b566196
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Mar 2 14:49:22 2016 -0800

    fooling cmake for real

commit 20c2560f75eab952e5131b484284bf20cb07fe07
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Mar 2 14:43:05 2016 -0800

    fooling cmake

commit a0ada44bc82941830f6c71219a1492d28c28c306
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Mar 2 14:26:59 2016 -0800

    makes CMake for Mac happy

commit 656b4f5e2dd741215a4699db979fe1b0dce60298
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Mar 2 13:50:15 2016 -0800

    linux fix

commit fa98aeac8505c764f4a69f15c8a8ff1123fad2a3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Mar 2 11:18:18 2016 -0800

    links correctly!

commit 9c56ce7143d3a35b44d33f246cec093ca9eaa7d9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Mar 1 17:44:58 2016 -0800

    Squashed commit of the following:

    commit 2ef52723dae44204c047cb177d5a5670fb659c79
    Merge: 8a5c998 25cf1f1
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Mar 1 16:54:04 2016 -0800

        Merge branch 'v3' into cmake_android

    commit 8a5c9981192e344fffc9f14be5cb14f66eccfa24
    Author: Chaoren Lin <chaorenl@google.com>
    Date:   Thu Feb 11 18:34:46 2016 -0800

        Fix module name in Android template to match CMake project.

    commit be85e19e852a9d5fbd6c58cea60c75fe47a5a576
    Author: Chaoren Lin <chaorenl@google.com>
    Date:   Thu Feb 11 18:27:45 2016 -0800

        Add missing platform specific source file to CMake project.

    commit 705389ac6582107a381d0cbc56268eaa98ffc5c3
    Author: Chaoren Lin <chaorenl@google.com>
    Date:   Wed Feb 10 19:21:12 2016 -0800

        Find AndroidNdkModules.cmake relative to android.toolchain.cmake.

    commit a10075e2cb30af2e1f9a30da99efac880658ad6b
    Author: Chaoren Lin <chaorenl@google.com>
    Date:   Wed Feb 10 19:03:11 2016 -0800

        Remove cpp-empty-test from project templates.

    commit e070fcbf210b8628f75785e738202a80a95ac0ff
    Author: WenhaiLin <wenhai.lin@chukong-inc.com>
    Date:   Mon Aug 31 09:56:03 2015 +0800

        Fix CMake for Android Target
 2016-03-02 16:51:54 -08:00
WenhaiLin 5cdfdf8497 [ci skip][Android Studio Projects]Update Gradle Plugin from 1.2.3 to 1.3.0 2015-08-18 22:37:00 +08:00
WenhaiLin 875d01573a [Android Studio Projects]Update Gradle from 2.2.1 to 2.4 2015-07-31 21:20:42 +08:00
WenhaiLin cbb073e905 Fixed Application may be created more than once on Android. 2015-06-23 16:58:38 +08:00
Bin Zhang c491b6a5c1 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-05-25 17:01:29 +08:00
Bin Zhang 3298145eb5 Support build & run Android Studio project in console. 2015-05-25 16:53:36 +08:00
Bin Zhang 3d0c716ee9 Add script in build.gradle for sign the release apk. 2015-05-22 15:52:41 +08:00
Bin Zhang 94e2e1cb00 Modify the configuration for android studio support in console. 2015-05-21 18:27:30 +08:00
Bin Zhang 41792caa6b Add files & configuration for android studio support in console. 2015-05-21 16:34:03 +08:00
Bin Zhang 78d4089215 Add the project.properties for the ndk-build of proj.android-studio. 2015-05-21 15:43:01 +08:00
Bin Zhang 37dddf9b15 Add execute permission for the gradlew in proj.android-studio. 2015-05-21 15:31:18 +08:00
WenhaiLin a569d877ba [ci skip]Remove unnecessary code. 2015-05-20 18:05:46 +08:00
WenhaiLin df3548673f Remove unnecessary files. 2015-05-20 10:19:32 +08:00
WenhaiLin 26f094b1a7 Remove unnecessary files 2015-05-18 16:02:05 +08:00
WenhaiLin 54b6260dfd Rename module 2015-05-18 15:17:05 +08:00
WenhaiLin 6dd3108e42 Rename module 2015-05-18 15:01:20 +08:00
WenhaiLin 68188f7424 Add native code for AS project. 2015-05-18 13:41:58 +08:00
WenhaiLin 7caa6bb2fc Update Copyright. 2015-05-18 09:59:50 +08:00
WenhaiLin dc8492948e Add Android Studio support 2015-05-15 16:37:43 +08:00