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

30202 Commits

Author SHA1 Message Date
jianglong0156 6eddf97416 fix the platform judge error 2015-06-02 17:29:36 +08:00
jianglong0156 0c821379f8 modify video mp4 formate 2015-06-02 17:07:11 +08:00
WenhaiLin 88697bf136 Remove unused function. 2015-06-02 16:38:06 +08:00
WenhaiLin 67d0088103 Fixed the text line height calculation is wrong with system font on Android. 2015-06-02 16:23:40 +08:00
jianglong0156 4abaa51e12 webview and videoplayer only play in android, ios and web 2015-06-02 15:06:44 +08:00
yangxiao 3d4606921b merge cocos 2015-06-02 14:27:31 +08:00
pandamicro 5cebc704ec Merge pull request #12135 from CocosRobot/update_cocosfiles_1433224063 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-06-02 13:51:38 +08:00
jianglong0156 ac71777e97 add webview and videoplayer protect contidition. 2015-06-02 13:50:55 +08:00
CocosRobot a15766adab [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-02 05:47:44 +00:00
子龙山人 e66195ddfc Merge pull request #12131 from MSOpenTech/v3-winrt-version 
V3: updated external/config.json to version 57
 2015-06-02 13:45:07 +08:00
yangxiao 1d61bdb7a0 update dependency 2015-06-02 13:36:34 +08:00
jianglong0156 c46fea1f7a Merge branch 'v3' into videoplayer 2015-06-02 11:26:48 +08:00
Dale Stammen c4e1805ecb updated to version 57 2015-06-01 19:43:26 -07:00
pandamicro 7e6eed5832 Reverse change in submodules 2015-06-02 10:42:50 +08:00
子龙山人 6030b79c7d Merge pull request #12129 from andyque/update-changelog-v3 
[ci skip]update changelog
 2015-06-02 10:26:47 +08:00
andyque 4af5ba11a6 update changelog 2015-06-02 10:26:09 +08:00
jianglong0156 97d0265e32 gzip test 2015-06-02 10:23:30 +08:00
pandamicro 4c6f67fd7e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	tools/bindings-generator
	web
 2015-06-02 10:12:22 +08:00
子龙山人 2c611693c6 Merge pull request #12123 from WenhaiLin/v3-UserDefault-robustness 
Improve UserDefault's robustness on Android.
 2015-06-02 10:11:19 +08:00
子龙山人 40ea6e3e41 Merge pull request #12103 from samuele3hu/v3_http_leak 
Fix the memory leak of HttpClient on the iOS/Mac platform.
 2015-06-02 10:11:03 +08:00
子龙山人 9ec7b06045 Merge pull request #12073 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2015-06-02 10:10:47 +08:00
pandamicro fdec552ed7 Fix cocos2d/cocos2d-js#1658: Fix js_load_remote_image issue with multithread and improve Downloader 2015-06-02 10:08:13 +08:00
子龙山人 d671591c5a Merge pull request #12128 from CocosRobot/update_cocosfiles_1433210584 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-06-02 10:07:09 +08:00
CocosRobot bae9082fc7 [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-02 02:03:05 +00:00
子龙山人 0ab6472ee6 Merge pull request #12107 from MSOpenTech/v3-uwp 
V3: Windows 10.0 Universal App (UWP) support
 2015-06-02 10:00:40 +08:00
子龙山人 b971bfb6e6 Merge pull request #12125 from andyque/fixWindowsResourceNotCopyIssue 
fix resource not copy issue on windows
 2015-06-02 09:37:30 +08:00
江龙 a8b640f751 add videoplayer project 2015-06-02 09:04:15 +08:00
andyque a6649e24fe fix resource not copy issue on windows 2015-06-01 18:59:27 +08:00
yangxiao 5bf09a676e setRadius and setGeight implementation 2015-06-01 17:38:35 +08:00
zhukaixy 47335bb618 configure project for navigation on win8.1 2015-06-01 16:25:42 +08:00
WenhaiLin 9d8225aae8 Improve UserDefault's robustness on Android. 2015-06-01 15:09:11 +08:00
Huabing.Xu 27d0f6328f origin code of viewport 2015-06-01 14:26:08 +08:00
linshun 09b52331d1 issue #12078: added renderer group and removed core and support group. 2015-06-01 13:43:56 +08:00
子龙山人 2dff8927e9 Merge pull request #12122 from andyque/update-changelog-v3 
[ci skip]update changelog
 2015-06-01 11:25:41 +08:00
andyque 8bb4e6b75b update changelog 2015-06-01 11:24:53 +08:00
子龙山人 d7534c26a3 Merge pull request #12106 from WenhaiLin/v3-audio-ios-phonecall 
AudioEngine:Fixed audio can not resume if it is interrupted cause by an incoming phone call.
 2015-06-01 11:19:01 +08:00
子龙山人 4e914a01da Merge pull request #12098 from WenhaiLin/v3-simpleaudio-lagged 
Fixed SimpleAudioEngine::playEffect() lagged on Android 5.0.x
 2015-06-01 11:17:26 +08:00
子龙山人 ced17e552e Merge pull request #12118 from andyque/skip-ci-build-for-v3-doc 
[ci skip]skip ci build for v3-doc
 2015-06-01 11:15:18 +08:00
andyque dea0387f1a skip ci build for v3-doc 2015-06-01 11:14:43 +08:00
yangxiao a0adf507c0 getTriangleList instead of load obj 2015-06-01 10:56:17 +08:00
Huabing.Xu 739923a4a3 Merge branch 'v3' into v3Viewport 2015-06-01 09:41:45 +08:00
Dale Stammen 494a7079d3 fixed test for Windows 10 CC_PLATFORM_WINRT 2015-05-29 09:35:53 -07:00
Dale Stammen a16d51cad9 keyboard events now available in Windows Universal Apps 2015-05-29 08:15:04 -07:00
Dale Stammen e0c65c203a Merge branch 'v3' into v3-uwp 2015-05-29 08:09:05 -07:00
WenhaiLin 59435f8749 AudioEngine:Fixed audio can not resume if it is interrupted cause by an incoming phone call. 2015-05-29 21:41:54 +08:00
子龙山人 839e7fbb59 Merge pull request #12100 from CocosRobot/update_cocosfiles_1432884847 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-05-29 17:24:50 +08:00
samuele3hu ae6cb678c6 Fix the memory leak of HttpClient on the iOS/Mac platform. 2015-05-29 17:13:49 +08:00
yangxiao c782d63bef add 3d navigation 2015-05-29 16:45:33 +08:00
yangxiao 618f63cb35 replace windows folder sperator 2015-05-29 16:43:36 +08:00
yangxiao 410d09525f setTransparent for mesh command 2015-05-29 16:38:42 +08:00