newnon
5d006192aa
V3 multisampling support ( #18632 )
...
* Multisampling support
* fix opengl initialization with multisampling
* fix merge conflict
* reverted default attributes
2018-01-19 09:28:22 +08:00
James Chen
57170200dd
fixed #17685 : [android] Audio in game couldn't be mute while a ring or a call is coming ( #17686 )
...
* fixed #17685 : [android] Audio in game couldn't be mute while a ring or a call is coming
* Updates comments in AudioEngine-inl.cpp and removes extra empty line in javaactivity-android.cpp
* Puts audio focus relative code to another java file named Cocos2dxAudioFocusManager.java
Renames setAudioFocusLost to setAudioFocus.
* Renames JNI function.
* Register audio focus in onResume and unregister it in onPause.
2017-04-13 10:44:08 +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
04fd2b16b2
merge v3.13 back to v3
2016-08-29 11:57:13 +08:00
James Chen
b135d512d2
Update copyright to 2016. ( #16311 )
2016-08-05 09:42:15 +08:00
minggo
03723da032
implement bsd_sinal for compiling or Android 21+ ( #16292 )
2016-08-02 16:52:15 +08:00
Xpol Wan
90456d29ba
Fixes 1605 include path in 541 files
...
using the tools/coding-style/include-linter.py with -f options.
2016-03-20 21:53:44 +08:00
XiaoFeng
1a56668cd3
Fix "TextureCache Test" in js-test crash under Android
2015-11-06 09:49:19 +08:00
WenhaiLin
cbb073e905
Fixed Application may be created more than once on Android.
2015-06-23 16:58:38 +08:00
Jongryul Kook
dfe30e159f
Need JNIEXPORT for -fvisibility=hidden
2015-05-06 14:24:48 +09:00
Ricardo Quesada
0972506bf5
compiles and runs on linux
2014-09-09 17:41:49 -07:00
Ricardo Quesada
9082ca18c3
Platform fixed
2014-09-09 16:50:02 -07:00