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

36346 Commits

Author SHA1 Message Date
minggo 8b3755c673 [ci skip]Changelog releasenote (#17695) 
* update release note

* update toc

* update changelog
 2017-04-13 14:36:00 +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
pandamicro 77724d3c85 [ci skip]Fix JS test issues reported from QA (#17691) 
* Fix websocket sendbinary issue

* Fix web issues reported from QA
 2017-04-12 11:41:39 +08:00
minggo 270bcb28a5 do not set attributes in java (#17680) 
if setting attribures in java code, then engine can not select GLES2/GLES3 dynamically
 2017-04-10 17:41:53 +08:00
minggo 9c9fd875a4 do not use git command (#17679) 
the script may be used in a folder that is not a git repo
 2017-04-10 17:07:08 +08:00
minggo 7fe419653e do not use git command (#17677) 
the script may be used in a folder that is not a git repo
 2017-04-10 17:04:23 +08:00
pandamicro 8acf8f84ed Merge pull request #17660 from ricardopetrere/patch-1 
cc.Follow not working on mobile
 2017-04-10 15:19:41 +08:00
James Chen 4dac6b3f36 Fixed WebSocket.cpp memory leaks (#17672) 2017-04-10 14:16:55 +08:00
James Chen 97adaabefb Don’t link with libGLESv1_CM.so (#17673) 2017-04-10 14:16:36 +08:00
James Chen ccb0c168d4 [android] Fixes that android studio project will be created with a default package name ‘org.cocos2dx.MyLuaGame’. (#17674) 2017-04-10 13:50:31 +08:00
James Chen 56ae741124 fixed #17665: [android] Crash while launching on the devices only support OpenGL ES 2. (#17671) 
* fixed #17665: [android] Crash while launching on the devices only support OpenGL ES 2.
Fixes that egl.eglCreateContext may return non-null but EGL10.EGL_NO_CONTEXT value.
It will cause create a EGL env with a EGL_NO_CONTEXT egl context which will cause crash.

* Don’t link with libGLESv1_CM.so
 2017-04-10 11:49:33 +08:00
Wilson E. Alvarez 21f51f0f48 Fixed WebSocket.cpp memory leaks (#17653) 2017-04-10 10:28:05 +08:00
Andrey 1c697796ea Fixed FileUtils::getFileSize() on android platform (#17632) 2017-04-10 10:16:21 +08:00
Steve Tranby e3e00906e3 Fix can't open URLs that have '&' character. (#17633) 
See discussion: http://discuss.cocos2d-x.org/t/small-fix-for-application-openurl-linux/35993
 2017-04-10 10:15:29 +08:00
James Chen 1f39fd5fdf CocosDenshionTest, unload doesn't work for android 5.0.1 devices (#17662) 2017-04-10 10:14:47 +08:00
James Chen e5e87311b6 [lua-tests] Check the validity of label instance before setString. (#17664) 
* [lua-tests] Check the validity of label instance before setString.
fixed http://punchbox.info:3000/issues/26233

* Minor fix: Adds missing test case in NewAudioEngineTest.
 2017-04-10 10:14:06 +08:00
newnon ad260980c7 projection fixes (#17487) 2017-04-10 09:15:40 +08:00
Ricardo Petrére c69823ba6f cc.Follow not working on mobile 
When using a cc.Follow action, I've tested on mobile devices (Android & iOS) and it's not working. This changed fixed the problem.
 2017-04-06 08:45:06 -03:00
minggo 666e001e62 update architecture picture (#17659) 2017-04-06 17:57:55 +08:00
minggo 513092bd88 fix error (#17656) 2017-04-06 16:18:28 +08:00
minggo 8a587a3681 [ci skip]fix some error for Android Studio project (#17655) 
* use '/' for path separator on windows

* enable short commands
it is useful on windows because windows has length limitation of commands
 2017-04-06 15:41:38 +08:00
minggo 2ee3274029 skip some test on android (#17648) 2017-04-05 17:40:47 +08:00
minggo c27cca3d17 update readme 2017-04-05 15:49:42 +08:00
minggo ea8ffa3c1c Merge pull request #17630 from minggo/merge-v315 
Merge v315
 2017-04-05 15:42:53 +08:00
minggo 4ad1901a92 fix comiling issue 2017-04-05 14:57:04 +08:00
minggo 9c77f09c49 fixed bug that toggle can not work at first time (#17647) 2017-04-05 14:26:11 +08:00
minggo 2f173104b4 fix resource (#17645) 2017-04-05 14:13:17 +08:00
Dale Stammen ce8a513c73 fixed build properties for compiling md5.c (#17638) 2017-04-05 10:28:57 +08:00
James Chen acc97516d8 Sensor timestamp fix, tizen uses micro-seconds as timestamp unit. (#17629) 2017-04-01 17:20:48 +08:00
minggo 9ed5127edc synchronize v3.15 2017-04-01 17:16:45 +08:00
minggo 1f57542d68 match the logic to unbind vao (#17628) 2017-04-01 15:37:22 +08:00
James Chen 06fe9a28fe Tizen compilation fix (#17627) 2017-04-01 15:32:40 +08:00
CocosRobot 7ae2e9ebd0 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17626) 2017-04-01 14:45:38 +08:00
James Chen a924e29c2c Adds libmd5-rfc third-party library for calculating MD5 since the functions in <openssl/md5.h> aren’t exported in win10, plus <openssl/md5.h> seems to be private header. (#17625) 
* Adds libmd5-rfc library since the functions in <openssl/md5.h> aren’t exported in win10, plus <openssl/md5.h> seems to be private header.

* Adds libmd5-rfc library for win32 and win10.

* Removes json/msinttypes folder from xcode since it’s only needed for win32 | win10.
 2017-04-01 11:43:17 +08:00
pandamicro 4fe75a99b5 Update engine version (#17624) 2017-03-31 16:09:20 +08:00
minggo d2a5c194cc adjust position (#17622) 2017-03-31 10:20:08 +08:00
James Chen 439f371758 fixed #17619: [android] Crash if uncache audio in the finished callback (#17620) 2017-03-31 09:38:45 +08:00
minggo 1d3c6d6f5c copy needed resources (#17618) 2017-03-30 17:03:19 +08:00
minggo b6d42e0b42 fix error effect (#17612) 2017-03-29 17:20:01 +08:00
minggo 9d81f16bc5 [ci skip]make android studio work for release mode (#17610) 
* release mode of lua test case work with Android Studio

* add missing file

* fix error for debug mode

* make android studio work
 2017-03-29 15:56:46 +08:00
minggo c5140f7af2 remove unneeded test case (#17609) 2017-03-29 14:24:11 +08:00
James Chen 2b3087ffc5 Fixes ConsoleUploadFile test could not work on android. (#17607) 
* Should not use fread to read file from assets, uses FileUtils::getDataFromFile instead.
* Client socket should not be closed immediatelly after ::send. Otherwise, sever may will receive “Connection reset by peer - Errno 104” error on some platforms. It could be 100% reproduced on Android.
 2017-03-29 14:23:33 +08:00
CocosRobot 31c0e27b4b [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17606) 2017-03-29 14:23:15 +08:00
James Chen 1eea499466 fixed #17603: Connection error in Console uploadFile test. (#17604) 
* fixed #17603: Connection error in Console uploadFile test.

* tab -> spaces

* tab -> spaces

* tab -> spaces
 2017-03-29 09:17:37 +08:00
pandamicro 87f8409375 Fix some web issues and update web engine (#17600) 2017-03-28 14:40:44 +08:00
minggo 63a81b1f7e add 'virtual' for ActionManager functions (#17594) 2017-03-28 09:25:48 +08:00
minggo aa3bff6c12 fix comment and explicitly initialize _anchorPoint (#17597) 2017-03-28 09:25:25 +08:00
pandamicro d25cd8ddf4 [ci skip] Fix QA issues (#17596) 
* Fix RenderTexture#clear API inconsistency

* Improve js-tests desktop page

* Fix issues in js test cases
 2017-03-27 18:03:20 +08:00
James Chen 6217d8c5ca fixed #17591: [ios, mac, win32] Audio could not be played in the callback of AudioEngine::setFinishedCallback (#17593) 
* Moves the implementation of AudioEngine::AudioInfo to cpp file.

* fixed #17591: [ios, mac, win32] Audio could not be played in the callback of AudioEngine::setFinishedCallback

* fixed #17591: Adds test case.
 2017-03-27 17:28:39 +08:00
minggo c8af3fe0bd fix crash in release mode (#17592) 2017-03-27 15:19:24 +08:00