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

128 Commits

Author SHA1 Message Date
WenhaiLin df3548673f Remove unnecessary files. 2015-05-20 10:19:32 +08:00
minggo e700ef6d30 Merge pull request #11856 from WenhaiLin/v3-support-android-studio 
Add Android Studio support
 2015-05-18 16:17:24 +08:00
WenhaiLin 26f094b1a7 Remove unnecessary files 2015-05-18 16:02:05 +08:00
WenhaiLin 6dd3108e42 Rename module 2015-05-18 15:01:20 +08:00
WenhaiLin dc8492948e Add Android Studio support 2015-05-15 16:37:43 +08:00
minggo 5e776381aa Merge pull request #11820 from Dimon4eg/v3 
Fix crash in web view if illegal character in url (Android only)
 2015-05-15 10:12:54 +08:00
pandamicro 8577055d5a Implement localStorage.clear on Android 2015-05-14 10:40:25 +08:00
dkorchinskiy 9d7e5e5edc Fix crash in web view if illegal character in url (Android only) 2015-05-13 14:56:07 +03:00
minggo a718c11eb6 Merge pull request #11724 from andyque/fix-binding-generator 
fix upstream compile error
 2015-05-07 11:47:20 +08:00
andyque db95034798 fix android compile error 2015-05-07 10:37:19 +08:00
Jongryul Kook dfe30e159f Need JNIEXPORT for -fvisibility=hidden 2015-05-06 14:24:48 +09:00
minggo 4acd231f89 merge v3.6 2015-04-30 13:46:08 +08:00
WenhaiLin 1950498b0a Replace tab with space. 2015-04-29 18:41:10 +08:00
Wenhai Lin 1d9ff11837 VideoPlayer:Fixed can't play video on Android 2.3.x 2015-04-29 18:32:59 +08:00
WenhaiLin dc768dbd8c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-jsb-merge 2015-04-20 10:06:48 +08:00
andyque d3a06de6d6 remove system zlib dependency since we use our own prebuilt version of 
zlib now.
 2015-04-17 17:24:33 +08:00
zhangbin 1f491cf656 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb 
Conflicts:
	build/cocos2d-wp8.sln
 2015-04-16 17:04:07 +08:00
Wenhai Lin 2dd88e8be5 Fixed JNI illegal start byte error 2015-04-15 18:20:52 +08:00
zhangbin 8c2413aa54 Add submodule js-bindings & html5. 2015-04-14 15:20:46 +08:00
minggo 8e32933dd3 Merge pull request #10340 from seobyeongky/network_bugfix2 
receive content data even though status code is not 2xx
 2015-03-19 21:12:51 +08:00
lyubomirv 2aec39ad56 Added Bulgarian language. 2015-03-17 15:14:02 +02:00
byeonggee.seo a2274162b5 merged 2015-03-12 10:06:53 +09:00
loadrunner 9e310ba272 added Romanian language 2015-02-25 17:25:19 +02:00
byeonggee.seo 753335726a receive content data even though status code is not 2xx 2015-02-03 16:28:23 +09:00
Wenhai Lin 81198583f1 Fixed sets the page's base URL for WebView doesn't work. 2015-01-23 18:30:12 +08:00
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