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

103 Commits

Author SHA1 Message Date
Wenhai Lin b20d59c596 Fixed the alpha channel of text color of system font not take effect[android] 2015-01-20 17:34:13 +08:00
WenhaiLin 415bbeba21 Fixed the alpha channel of text color of system font not take effect 2015-01-20 16:04:14 +08:00
WenhaiLin 6a2ac7aaf8 [ci skip]Fixed log level within the CocosPlayClient 2015-01-15 18:21:03 +08:00
WenhaiLin 553cf58312 Remove FileUtilsAndroid::purgeCachedEntries 2015-01-14 16:05:33 +08:00
Wenhai Lin 58c45ca144 Integrate CocosPlayClient 2015-01-13 17:30:07 +08:00
WenhaiLin 57cd4cd3c6 Fixed VideoPlayer can't play when passing the full path of video resource 2015-01-09 19:14:19 +08:00
WenhaiLin d92a525bfa Fixed dead loop when width of label[system font] smaller then one word of the string on android 2015-01-09 16:52:40 +08:00
Huabing.Xu b5859114b7 Merge pull request #9778 from samuele3hu/v3_4_bug_xmlhttp 
Fix crash on the XmlHttpRequestTest for Lua and parsing error of response headers for HttpURLConnection
 2015-01-07 17:45:43 +08:00
Huabing.Xu 339a8b1abc class rename for EGLConfigChooser 2015-01-06 16:18:01 +08:00
Huabing.Xu 1180f7a41e move class cocos2dEGLConfigChooser to Cocos2dxActivity 2015-01-06 12:44:29 +08:00
samuele3hu 832a87f5f0 Fix crash on the XmlHttpRequestTest for Lua and parsing error of response headers for HttpURLConnection 2015-01-04 17:09:35 +08:00
samuele3hu 3795f9cc2a Rename HttpClient-android.cpp and unify java indent format 2014-12-31 12:03:27 +08:00
samuele3hu f7ed73c1e1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_4_httpclient 2014-12-31 10:17:12 +08:00
samuele3hu 0e94bdda3a Use android network module — HttpURLConnection to replace the libcurl on the android platform 2014-12-31 10:15:14 +08:00
Mykyta Usikov d9b5ab4a4c added Turkish and Ukrainian language; 
replaced 'tabs' with 'spaces' in Application::getCurrentLanguage();
 2014-12-25 12:08:23 +02:00
minggo 0e7470505f replace tab with 4 spaces 2014-12-10 18:32:58 +08:00
minggo 77ed7a47e2 use java coding style 2014-12-10 18:07:46 +08:00
Wenhai Lin 1bfdd757a2 Fixed fail to play background music again after invoking stopBackgroundMusic 2014-12-02 15:03:26 +08:00
James Chen 528f24010b Workaround for missing __ctype_get_mb_cur_max function in ndk-r10c 2014-11-25 10:33:16 +08:00
minggo 88c3cc2ad9 Merge pull request #9105 from Dhilan007/v3-video-web-fix 
Fix WebView and VideoPlayer in wrong place on Android 2.3.x
 2014-11-24 15:15:18 +08:00
Dhilan007 5a8ac8f151 Fix WebView and VideoPlayer in wrong place on Android 2.3.x 2014-11-13 18:15:41 +08:00
minggo ee31273fa5 Merge pull request #9088 from Dhilan007/v3-audio-Lollipop 
Fix SimpleAudioEngine::sharedEngine()->playBackgroundMusic() freeze on Lollipop
 2014-11-13 16:02:40 +08:00
LinWenhai 48f1bd62d7 remove unrelated modification 2014-11-13 15:43:39 +08:00
LinWenhai a37549d7bc Update Cocos2dxMusic.java 2014-11-13 11:00:29 +08:00
wangqm0513 9415b2b930 Update TouchesJni.cpp 
fixed gamelist can't pull by mouse.
 2014-11-12 14:21:48 +08:00
Dhilan007 76c9accec9 Fix SimpleAudioEngine::sharedEngine()->playBackgroundMusic() crash on Lollipop 2014-11-12 13:01:47 +08:00
kaylyun 97c076337a BUGFIX:SOMETIMES APP DIRECTLY AT THE STARTUP 
Sometimes app directly at the startup on android platform.
 2014-10-30 10:21:19 +08:00
minggo 18ca7c936c Merge pull request #8768 from Dhilan007/v3-33rc 
Improve Android.mk
 2014-10-17 14:09:49 +08:00
Dhilan007 ccbc668427 Improve Android.mk 2014-10-17 10:13:33 +08:00
minggo 8b1fe93269 Merge pull request #8762 from Dhilan007/v3-33rc 
disable warn on zero-sized structure[android].
 2014-10-17 09:34:41 +08:00
Dhilan007 5595947dc3 disable warn on zero-sized structure[android]. 2014-10-16 21:41:52 +08:00
Mircea Rila 0678601f61 decrease logging verbosity - CCFileUtils-android 2014-10-16 13:03:39 +03:00
lite3 3419a38961 Merge remote-tracking branch 'upstream/v3' into v3 2014-10-11 17:40:47 +08:00
minggo 5a60e99131 Merge pull request #8577 from ntotani/detach-thread-on-exit 
call detach method on thread exit
 2014-10-11 16:54:59 +08:00
lite3 e1814d0480 add virtual in FileUtilsAndroid::getNewFilename 2014-10-11 11:20:14 +08:00
Huabing.Xu d5e29d285d fix gel Config error on android 2014-10-09 18:34:14 +08:00
Naoyuki Totani b0d1fb79b3 call detach method on thread exit 2014-10-08 18:34:06 +09:00
lite3 21081b9e1a use reference 2014-09-30 01:07:19 +08:00
lite3 240b922271 remove '../' at path on android. 
because AAssetManager_open do not support '../' in path.
 2014-09-29 19:31:05 +08:00
Huabing.Xu 88679c2437 change tab to space 2014-09-29 18:44:01 +08:00
minggo 0cd2f985e8 Merge pull request #8172 from dabingnn/v3_fixEGLConfigCrashBug 
fix egl config chooser bug
 2014-09-29 18:24:19 +08:00
Huabing.Xu d7a5c464dd remove test code 2014-09-26 16:37:05 +08:00
Huabing.Xu 7cfcdc1af8 fix egl config chooser bug 2014-09-26 16:23:54 +08:00
Sergey 2255cf91ba openUrl function for all platform but on windows RT empty function 2014-09-22 17:47:38 +04:00
Ricardo Quesada f5cd48f154 Android properties back to 10 2014-09-09 18:46:47 -07:00
Ricardo Quesada fdabaa3082 Compiles on Android 2014-09-09 17:53:08 -07: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
oleg-akatsuki 511ee30b6e Move constructor from private to public 
In my project I want to add extra functionality to FileUtils. For security reasons I make FileUtils function that can extract encoded data directly to memory without storing it on disk. So I am trying to use FileUtilsAndroid as base class, but it is impossible as constructor is hidden as private member. I offer to move constructor to either public or protected to make it possible to use FileUtilsAndroid as base class.

Another way to solve the problem is to remove constructor as FileUtilsApple does not have a constructor.
 2014-09-09 11:34:48 +09:00
Dhilan007 64d926a75f fix compile error on android. 2014-09-04 11:04:50 +08:00