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

36220 Commits

Author SHA1 Message Date
CocosRobot ddb4dc893b [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17733) 2017-04-21 09:16:25 +08:00
子龙山人 677c32861e Update README.md 2017-04-20 15:51:44 +08:00
子龙山人 947d068ac7 Merge pull request #17732 from zilongshanren/add-tizen-daily-build 
[ci skip]add tizen mac daily build
 2017-04-20 15:14:16 +08:00
zilongshanren bc67f3b3fc add tizen mac daily build 2017-04-20 15:13:40 +08:00
子龙山人 012cf2a636 Merge pull request #17731 from zilongshanren/add-tizen-daily-build 
[ci skip]Add tizen daily build
 2017-04-20 15:05:20 +08:00
zilongshanren 7bc327683a add tizen daily build script 2017-04-20 15:04:14 +08:00
zilongshanren 7b3698007c fix tizen cpp-tests CLI compilation 2017-04-20 14:59:33 +08:00
David DeSimone 246406bda1 Adding additional async functions to FileUtils (#17634) 
* Adding async functions for FileUtils::listFiles and FileUtils::listFilesRecursively.

* Updating CCFileUtils::listFiles and CCFileUtils::listFilesRecursively to not expose their async version to
the JS and Lua scripting layers, due to a bug in the binding generator code.

* Updating comments in CCFileUtils.h to prevent improper JS bindings to be generated.

* Editing the cocos2dx.ini files, to prevent bindings for listFilesRecursivelyAsync and listFilesAsync to be generated.
 2017-04-19 09:14:06 +08:00
子龙山人 330ac0f002 Merge pull request #17721 from zilongshanren/add-tizen-daily-build 
fix android daily build
 2017-04-18 11:23:21 +08:00
zilongshanren f35218026d fix android daily build 2017-04-18 11:10:11 +08:00
子龙山人 8263538bf5 change api level to 13 (#17720) 2017-04-18 11:10:10 +08:00
minggo 386c84e49a complete tizen section (#17719) 2017-04-18 10:04:29 +08:00
CocosRobot 56cad142ab [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17712) 2017-04-18 09:12:21 +08:00
minggo 6ea7bf3784 Merge pull request #17701 from minggo/mergev315 
Mergev315
 2017-04-17 09:12:54 +08:00
minggo ee84d9f12e update v3.15 2017-04-14 13:45:32 +08:00
pyrosphere 72c558e070 Change library/header search paths of external libraries for tvOS. (#17547) 
* Fixes cocos2d build for tvOS.

* Support for the tvOS micro gamepad as a CCController.

* Changes library/header search paths for external libraries from iOS to tvOS.

* Updated 3rd party libraries.
 2017-04-14 09:35:09 +08:00
minggo abcc4e6585 update release note (#17698) 2017-04-14 09:20:08 +08:00
CocosRobot 487490def0 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17693) 2017-04-13 17:59:19 +08:00
James Chen 3c1e36c2c3 Cleanup AudioEngine resource after exiting NewAudioEngineTest. (#17675) 
* Unschedules update in AudioEngine implementation while AudioEngine::end is called.

* Cleanup AudioEngine resource after exiting NewAudioEngineTest.
 2017-04-13 17:58:49 +08:00
minggo 75d0ebfefc Update RELEASE_NOTES_CN.md 2017-04-13 16:36:21 +08:00
minggo ef83df0cd6 Update RELEASE_NOTES_CN.md 2017-04-13 16:35:17 +08:00
minggo 085101803d Update RELEASE_NOTES_CN.md 2017-04-13 16:34:20 +08:00
minggo 55b67ab3b4 Update RELEASE_NOTES_CN.md 2017-04-13 15:30:53 +08:00
minggo c89dd7b189 Update RELEASE_NOTES.md 2017-04-13 15:29:43 +08:00
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