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
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
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
2c37be5d86
fix lua tempate error ( #16377 )
2016-08-17 16:09:48 +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
minggo
1cb506a5c5
fix compiling error if building for Android Studio ( #16317 )
2016-08-05 14:03:35 +08:00
James Chen
b135d512d2
Update copyright to 2016. ( #16311 )
2016-08-05 09:42:15 +08:00
mogemimi
808a10429b
Fix some typos in comments and strings ( #16290 )
2016-08-02 15:29:23 +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
3f60d1d886
remove code ide related codes in tempaltes
2016-07-08 17:17:23 +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
Vincent Yang
3addf38134
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
2015-07-22 12:01:34 +08:00
WenhaiLin
cbb073e905
Fixed Application may be created more than once on Android.
2015-06-23 16:58:38 +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
2c0f1c1a50
add lua runtime template
2015-04-21 01:25:44 +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
6c2eb01213
cleanup proj.android
2015-03-10 23:33:09 +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
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
yinjimmy
a80e26f680
cleanup
2015-01-14 16:27:29 +08:00
yinjimmy
bd3c250a6d
add proj.linux support
2015-01-14 14:44:48 +08:00
yinjimmy
c3a536bcf0
add lua-template-runtime
2015-01-13 18:28:33 +08:00
yinjimmy
cf331c3abd
update lua-template-default
2015-01-12 23:42:37 +08:00
yinjimmy
0978a88b7f
Merge branch 'v3' into combine
...
Conflicts:
templates/lua-template-default/frameworks/runtime-src/proj.android/jni/Android.mk
templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj
templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp
templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
tools/simulator/frameworks/runtime-src/proj.android/jni/Android.mk
tools/simulator/frameworks/runtime-src/proj.win32/simulator.vcxproj
2015-01-12 17:54:58 +08:00
yinjimmy
db80ab0028
update lua default template
2015-01-09 13:21:19 +08:00
dualface
c041787f01
update proj.android for template
2015-01-09 04:14:31 +08:00
yinjimmy
d2a3a6a8c0
merge lua-template-default with lua-template-runtime
2015-01-09 04:08:41 +08:00
samuele3hu
3e0852eb7a
Remove useless copy about luasocket on the android platform
2014-12-05 15:28:45 +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
dualface
b49d2351ff
update lua-template-default
2014-10-11 02:55:04 +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
471820568f
Update android.mk of cocos and lua-templates
2014-08-27 10:28:04 +08:00
samuele3hu
33fd605a16
Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases.
2014-08-27 10:18:44 +08:00
samuele3hu
22a48fb760
Update cpp and lua template to support cocos3d lib
2014-08-18 19:23:03 +08:00
samuele3hu
1976b66ab8
Make lua-template-default support all modules
2014-08-14 21:27:02 +08:00
samuele3hu
02da839798
Make lua-template-default support all modules
2014-08-14 16:54:33 +08:00
samuele3hu
032f5ea781
Adjust lua_debugger.h/c to lua runtime template and adjust related project configure
2014-08-14 00:06:28 +08:00
zhangbin
e766a22bda
Adjust the lua templates for the lua modules.
2014-08-13 14:29:14 +08:00
samuele3hu
3c3c05204f
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00