Peter Siegmund
bbdd289a62
Fix gradlew build ( #18592 )
...
* fixed ProGuard rule file
* add missing VIBRATE permission
* move permission to correct position in AndroidManifest.xml
2017-12-27 09:36:11 +08:00
minggo
5151dfd6f9
Remove ant projects ( #18532 )
...
* remove proj.android
* remove ant building and rename proj.android-studio to proj.android
* not pass --android-studio
2017-12-04 18:00:45 +08:00
minggo
9c67dcab9d
remove proj.android ( #18529 )
2017-12-04 11:26:43 +08:00
minggo
496de07633
don't have to set NDK_MODULE_PATH manually
2017-10-26 13:40:27 +08:00
James Chen
a73d5893b4
[android] Fixes AppAcitivity (Sub class of Cocos2dxActivity) is re-created which causes crash if launching app first time and re-opening from icon. ( #18271 )
...
* [android] Fixes AppAcitivity (Sub class of Cocos2dxActivity) is re-created which causes crash if launching app first time and re-opening from icon.
* Update AppActivity.java
* Update AppActivity.java
2017-09-18 15:12:30 +08:00
Jie Meng
9c35c90614
Fix android compile fail bug ( #18166 )
2017-08-16 17:44:11 +08:00
bulzipke
b5d871d53c
Hide virtual button by user control. ( #18100 )
...
* Hide virtual button by user control.
It want a lot of people, including me.
http://discuss.cocos2d-x.org/t/solved-android-navigation-bar/31760/3
http://discuss.cocos2d-x.org/t/android-cocos2d-v3-12-about-virtual-button/30811/5
http://joyplot.com/documents/2016/09/27/cocos2d-x-navigation-bar/
http://falstar.hateblo.jp/entry/2016/07/10/180112
* I also added the lua/js template.
Thank you for your work :)
2017-08-07 11:12:26 +08:00
minggo
77d8b0a52b
fix compiling issue on android ( #17960 )
2017-06-21 16:43:40 +08:00
RickyZheng001
f8e325792b
V3.15 ( #17752 )
...
* remove APP_SHORT_COMMANDS setting (#17722 )
some developers report it will cause error on Windows though i can not reproduce it. It is strange, the setting is used to resolve command length limitation on Windows.
* Particle font size should be a const value (#17676 )
* Particle font size should be a const value
* Minor fix: CCStencilStateManager.hpp -> CCStencilStateManager.h in xcode project.
* JSB SocketIO.connect supports to pass a CA cert file (#17736 )
* JSB SocketIO.connect supports to pass a CA cert file
* The second parameter of SocketIO.connect function is probably a `option` object. JSB just ignores it.
2017-04-27 09:25:20 +08:00
minggo
9ed5127edc
synchronize v3.15
2017-04-01 17:16:45 +08:00
effolkronium
55362547fa
Fix bug with unresolved symbols in Android Studio 2.3 ( #17586 )
...
* Fix bug with unresolved symbols in Android Studio 2.3
* Fix bug with unresolved symbols in Android Studio 2.3
2017-03-27 11:05:16 +08:00
minggo
db837ebdae
remove unneeded test cases and fix parameter length limitation on windows
...
* delete unnneded test case on windows
* delete unneeded test cases
* avoid parameter length limit when building android on windows
* adjust project setting to delete unneeded test cases
* remove unneeded test cases for windows10
* remove unneeded test cases for tizen
* remove unnedded test case for android
2017-03-22 13:43:12 +08:00
CocosRobot
d07794052f
Update license to 2017 ( #17362 )
...
* Typo: CopyRight -> Copyright
* Copyright update: chukong-inc.com -> Chukong Technologies Inc.
* [js files] Copyright update: 2014 -> 2014-2017
* [cpp files] Copyright update: 2014 -> 2014-2017
* Copyright update: 2015 -> 2015-2017
* [js files] Copyright update: 2014 -> 2014-2017
* Copyright update: 2016 -> 2016-2017
* Copyright update: 2013 -> 2013-2017
* Copyright update: 201?-201? -> 201?-2017
* License year fixes.
* Liscene year fix in CCRay.cpp
* Updates license years in CCGLProgramState.h & CCGLProgramStateCache.h
2017-02-14 14:36:57 +08:00
minggo
84a102edf8
merge v3.13.1 back to v3
2016-09-15 10:08:28 +08:00
minggo
937525a4de
prevent restarting activity on some events ( #16525 )
2016-09-06 16:12:49 +08:00
minggo
04fd2b16b2
merge v3.13 back to v3
2016-08-29 11:57:13 +08:00
minggo
3ce4134ab3
use java reflection to avoid API level dependent, use app-abi 10 ( #16371 )
...
* use java reflection to avoid API level dependent, use app-abi 10
* add license header
2016-08-17 13:55:26 +08:00
Greg Rynkowski
14b8fc0a71
Remove AppDelegate memory leak in Android projects ( #16333 )
...
* Remove AppDelegate memory leak from Android projects
AppDelegate object and all its members are never released.
As a solution I propose to use static unique_ptr that could destroy it
at the end of the application.
Issue:
https://github.com/cocos2d/cocos2d-x/issues/14110
* Correct code style in Android main.cpp files
- removed redundant headers (reduced dependencies)
- removed redundant code
- corrected code style
2016-08-08 10:53:04 +08:00
James Chen
b135d512d2
Update copyright to 2016. ( #16311 )
2016-08-05 09:42:15 +08:00
minggo
7131451f1b
change to use api 19 ( #16248 )
...
* change to use api 19
* update deps version
2016-07-29 13:57:01 +08:00
minggo
67ec4521e5
explicitly set app-abi to armeabi
2016-07-27 10:10:09 +08:00
minggo
5f2c1df448
use android 21 to fix compiling error
2016-07-22 10:53:56 +08:00
minggo
ecf181036a
remove unneeded files
2016-05-18 16:44:06 +08:00
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
XiaochenFTX
ec2aa7e8f2
Fix Android activity destroyed after reopen the app
2015-10-14 11:45:27 +08:00
WenhaiLin
cbb073e905
Fixed Application may be created more than once on Android.
2015-06-23 16:58:38 +08:00
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