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

266 Commits

Author SHA1 Message Date
minggo 2a712a0c3b set correct package name 2016-05-09 18:14:53 +08:00
minggo a5602cc732 merge v3.11 back to v3 2016-05-04 16:02:23 +08:00
zilongshanren c8d570c310 fix tizen template api-version issue 2016-05-03 11:22:34 +08:00
zilongshanren 675fe8e811 fix template project running 2016-05-03 11:02:22 +08:00
zilongshanren b2b774b66b fix tizen lua template 2016-04-29 17:59:10 +08:00
zilongshanren 482788c933 Add tizen support (#15518) 
* add Tizen Support

* fix linter error

* fix tizen audio engine lua bindings config
 2016-04-28 09:49:55 +08:00
minggo 9c40277e48 Merge pull request #14980 from catinred2/dev 
fix typo
 2016-04-18 17:21:40 +08:00
zilongshanren b879dce607 add audio SimpleAudioEngine.h search path back 2016-03-28 14:35:59 +08:00
Xpol Wan e7864cdb89 Removed unnecessary search paths. 2016-03-22 16:04:12 +08:00
Xpol Wan d6b2f08b30 The CC_TARGET_OS_* in xcodeproj are now not needed. 2016-03-16 13:20:53 +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
xming 2ebe511a06 fix typo 2016-01-27 17:59:30 +08:00
lunhao.guo ae980c19d2 fix the link error and compile error in windows and android platform 2015-12-09 20:18:37 +08:00
XiaoFeng 167aa9b648 Update console sub-module, update project template.json to meet file position change 2015-12-01 15:00:45 +08:00
yinjimmy 7f10d6d894 Template: keep compatibility 2015-11-04 18:26:59 +08:00
yinjimmy 517567c56c Template : fix link libraries 
1. GameController.framework in JS template
2. CFNetwork.framework in Lua template
 2015-11-04 12:19:29 +08:00
pandamicro 65fafef044 Merge pull request #14209 from pandamicro/v3 
Disable bitcode for all targets
 2015-10-22 12:55:25 +08:00
pandamicro 4633a93631 Disable bitcode for all targets 2015-10-22 12:18:51 +08:00
pandamicro 316d37ad51 Merge pull request #14130 from jimrange/iconSplash 
Fixed issues with the iOS icons and splash screens.
 2015-10-22 12:17:02 +08:00
Jim Range 5c93c56d80 Updated Lua and JavaScript iOS Info.plist, iOS splash screens and iOS icons. 2015-10-21 11:11:02 -05:00
Dirk de la Hunt 88bcaad518 General fixes: 
- changed some delete operations to be deletions of arrays where applicable
 - changed some "free" operations to "delete" where memory was allocated with "new"

CCPUScriptCompiler.cpp:
 - added checks to see if temp1 and temp2 are non-null before dereferencing them

FileServer.cpp:
 - changed the size of startFlag to be 13, seeing as the strcpy into it copies a string, "RuntimeSend:",
   is already 12 characters long, but strcpy() attempts to copy the NULL terminator too.
 2015-10-16 21:43:09 +02:00
zhangbin 4996fe5c1b Solve the error in templates. 
When creating project from template, the app name of android-studio project is not changed.
 2015-09-09 16:08:15 +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
zhangbin 38edfea28a Solve the error effect of lua portrait project created from template. 2015-08-14 17:20:21 +08:00
子龙山人 675d5efb39 Merge pull request #13151 from flashjay/patch-2 
Update AppController.h
 2015-08-12 13:43:39 +08:00
zhangbin 9fd88d6587 Optimize the lua & js templates. 
The changes are used for generating templates of Cocos Framework.
 2015-08-05 16:51:33 +08:00
pandamicro 3c2e66e425 Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3 
# Conflicts:
#	.travis.yml
#	build/cocos2d_js_tests.xcodeproj/project.pbxproj
#	build/cocos2d_tests.xcodeproj/project.pbxproj
#	cocos/2d/CCFont.h
#	cocos/2d/CCFontAtlas.cpp
#	cocos/2d/CCFontAtlas.h
#	cocos/2d/CCFontFreeType.cpp
#	cocos/2d/CCFontFreeType.h
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
#	cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
#	cocos/cocos2d.cpp
#	cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
#	templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
#	templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
#	templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
#	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
#	tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
#	tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
#	tools/bindings-generator
#	tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
#	tools/travis-scripts/generate-bindings.sh
#	tools/travis-scripts/generate-cocosfiles.sh
#	tools/travis-scripts/travis_mac.yml
 2015-08-02 22:28:27 +08:00
HuaYang Huang abbf7eabfc Update AppController.h 2015-08-01 17:49:12 +08:00
WenhaiLin 875d01573a [Android Studio Projects]Update Gradle from 2.2.1 to 2.4 2015-07-31 21:20:42 +08:00
Wenhai Lin 70628c9dec Fixed link errors on iOS/Mac 2015-07-29 13:59:58 +08:00
zhangbin 4d46a03797 Solve the error : the VS release configuration of lua template cause `cocos run` error. 2015-07-28 14:54:42 +08:00
Vincent Yang e4a8aeee45 Fixed #12962 : Scene can't have std::vector member. 2015-07-24 11:16:45 +08:00
pandamicro bd1f5b4a39 Merge pull request #12911 from natural-law/portrait-support 
Fixed #12252 : Support new portrait projects from templates.
 2015-07-23 15:38:32 +08:00
Vincent Yang 3addf38134 Fixed #12906 : Can't add custom member to cocos2d::Scene subclass. 2015-07-22 12:01:34 +08:00
Bin Zhang a8b22f6886 Support new portrait project from lua templates. 2015-07-20 09:58:40 +08:00
Wenhai Lin 45e0eda81c Fixed compile error 2015-07-17 11:34:26 +08:00
andyque 451bedbaad change sign team to none. 2015-07-07 22:02:35 +08:00
andyque 04ade7c16e remove xcode scheme 2015-07-07 14:57:25 +08:00
andyque 302976b603 add shared scheme to iOS & Mac project. 2015-07-07 14:24:17 +08:00
Ricardo Quesada 4c88be9520 removes -fno-excpetion and -fexception from cmake 2015-07-06 12:09:50 -07:00
WenhaiLin cbb073e905 Fixed Application may be created more than once on Android. 2015-06-23 16:58:38 +08:00
Bin Zhang 01cb135e77 Solve the error in the VS project of templates. 2015-06-17 18:06:09 +08:00
tangziwen b84531ea04 add librecast to js and lua templates 2015-06-17 13:39:28 +08:00
pandamicro f3765a4c5f Fix physics 3d macro include issue 2015-06-12 15:58:43 +08:00
andyque a6649e24fe fix resource not copy issue on windows 2015-06-01 18:59:27 +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
minggo 203203a92d Merge pull request #12001 from andyque/upgrade-rapidjson-to-1.0.2 
upgrade rapidjson to 1.0.2
 2015-05-25 15:18:15 +08:00
andyque 81d562803b upgrade rapidjson to 1.0.2 2015-05-25 11:43:03 +08:00
samuele3hu 0492323ec8 Update the Lua template 2015-05-24 23:14:23 +08:00
samuele3hu 074216bef9 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d 
Conflicts:
	templates/lua-template-default/frameworks/runtime-src/Classes/lua_module_register.h
	tests/lua-tests/src/mainMenu.lua
 2015-05-24 22:46:05 +08:00
子龙山人 49c0b44252 Merge pull request #11988 from andyque/add-vs2015-to-simulator 
fix simulator vs2015 support
 2015-05-23 09:48:32 +08:00
hugo 9a9fa7957f [A] add generate libs and binary template 2015-05-22 19:47:16 +08:00
andyque 73902a4063 fix simulator vs2015 support 2015-05-22 17:47:48 +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
andyque 03e8f16a8a add vs2015 support 2015-05-21 13:55:01 +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
minggo e700ef6d30 Merge pull request #11856 from WenhaiLin/v3-support-android-studio 
Add Android Studio support
 2015-05-18 16:17:24 +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
samuele3hu 71595898ed Update the Lua binding for Physics3D ,related test cases and the template project 2015-05-15 16:25:07 +08:00
yinjimmy 06bd26cb63 Fixed: app crash when console ui trace nil string on mac platform #11211 2015-05-15 15:08:42 +08:00
yinjimmy d78d8b2c1f move menu bar to system menu 2015-05-14 13:43:17 +08:00
WenhaiLin c70bac7bb4 Add support for visual studio 2015. 2015-05-12 16:26:28 +08:00
samuele3hu 037c17fe5d Remove vs2012 support in v3 2015-05-05 16:11:26 +08:00
zhangbin fc9e5609c8 Rename the target name of Xcode project in templates. 2015-04-30 15:20:47 +08:00
zhangbin 61cf0ad28b Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb 2015-04-23 15:46:19 +08:00
zhangbin dcca32bd82 Update the CMakeLists & the remote url of submodule js-bindings. 2015-04-23 14:23:19 +08:00
yinjimmy 94fe5ac206 set CC_CODE_IDE_DEBUG_SUPPORT=0 for lua-template-default 2015-04-22 10:12:40 +08:00
Jimmy Yin 8c4cd7ea42 Modify default console and upload port for lua runtime 2015-04-21 23:07:19 +08:00
yinjimmy 2c0f1c1a50 add lua runtime template 2015-04-21 01:25:44 +08:00
yinjimmy 7a228cd79f Merge branch 'v3' into lua_runtime 2015-04-17 18:28:42 +08:00
samuele3hu b300701ec4 Remove the reference of quick module 2015-04-17 15:52:45 +08:00
yinjimmy 5589796029 Merge branch 'v3' into lua_runtime 2015-04-17 15:27:04 +08:00
samuele3hu a64e90d469 Update the related project setting for Luajit and related test cases 2015-04-06 22:41:34 +08:00
yinjimmy 587ee21e4b revert lua runtime 2015-04-02 18:27:53 +08:00
SunLightJuly f321f725b0 fixed Java_org_cocos2dx_lua_AppActivity_nativeIsDebug(): return false only, because runtime have been removed 2015-03-13 16:12:08 +08:00
SunLightJuly 8c196847cb add security framework to Mac template project of Lua 2015-03-12 19:18:06 +08:00
SunLightJuly 608ed24180 Synchronization with V3 2015-03-11 00:02:50 +08:00
SunLightJuly 6c2eb01213 cleanup proj.android 2015-03-10 23:33:09 +08:00
SunLightJuly b77801a99b cleanup proj.win32 2015-03-10 22:56:03 +08:00
SunLightJuly ba55f14fbf removed runtime in libsimulator 2015-03-10 18:28:59 +08:00
SunLightJuly aac4d6f846 removed CodeIDESupport.h 2015-03-10 11:12:42 +08:00
SunLightJuly ff8c0dac2b removed framework of simulator 2015-03-10 10:51:16 +08:00
samuele3hu 1844fdd806 Fix the error that Android.mk for lua template re-assign the value of LOCAL_C_INCLUDES 2015-03-06 15:41:48 +08:00
yinjimmy 2042633294 update runtime to 2.0 2015-02-27 14:49:04 +08:00
SunLightJuly ec22923aa9 modifed AppDelegate.cpp: add function "register_all_packages()" to support packages manager 2015-02-24 20:50:58 +08:00
htl 12010ce3da fixed run lua samples 360 will popup access wifi note! 2015-01-21 15:30:05 +08:00
htl 52b03039fa fixed show open wifi dialog on android without runtime 2015-01-20 19:15:44 +08:00
dualface bc75849ac7 update template/runtime version 2015-01-16 23:22:03 +08:00
zhangbin b1f9fb4b8e Rename the Xcode target of libsimulator. 2015-01-16 14:29:48 +08:00