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

29822 Commits

Author SHA1 Message Date
pandamicro 7e6eed5832 Reverse change in submodules 2015-06-02 10:42:50 +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
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
andyque a6649e24fe fix resource not copy issue on windows 2015-06-01 18:59:27 +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
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
CocosRobot 27ed47cdfd [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-29 07:34:09 +00:00
子龙山人 039c0036be Merge pull request #12072 from iris-wy/v3 
Add enhance service  API
 2015-05-29 15:32:06 +08:00
WenhaiLin 9c31aafba0 Fixed SimpleAudioEngine::playEffect() lagged on Android 5.0.x 2015-05-29 14:52:25 +08:00
子龙山人 1d68fe8fc4 Merge pull request #12096 from CocosRobot/update_lua_bindings_1432880747 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-05-29 14:42:51 +08:00
CocosRobot 3a1b52cafd [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-05-29 06:31:00 +00:00
子龙山人 b39006432f Merge pull request #12091 from joshuastray/properties 
[ci skip]fix material test
 2015-05-29 14:22:36 +08:00
子龙山人 d0236c6aba Merge pull request #12094 from CocosRobot/update_lua_bindings_1432879965 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-05-29 14:22:16 +08:00
子龙山人 a165790ba9 Merge pull request #12083 from yangws/v3 
Add opengl version project/unproject function in camera.
 2015-05-29 14:21:56 +08:00
CocosRobot 7408e5f1cb [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-05-29 06:18:20 +00:00
子龙山人 2641fc529b Merge pull request #12093 from CocosRobot/update_cocosfiles_1432879493 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-05-29 14:07:52 +08:00
CocosRobot 635d5a43d2 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-29 06:04:54 +00:00
子龙山人 9567509ff1 Merge pull request #12089 from CocosRobot/update_cocosfiles_1432877907 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-05-29 14:00:49 +08:00
子龙山人 c823a1e494 Merge pull request #12090 from CocosRobot/update_lua_bindings_1432878025 
[AUTO]: updating luabinding & jsbinding automatically
 2015-05-29 14:00:21 +08:00
子龙山人 7d3620e33d Merge pull request #12092 from andyque/v3 
[ci skip]add ci skip to travis
 2015-05-29 14:00:00 +08:00
Jialong Zhai 9cf5c1b636 fix material test 2015-05-29 13:54:29 +08:00
andyque ff26903ddf add ci skip to travis 2015-05-29 13:47:28 +08:00
CocosRobot 892816de3a [AUTO]: updating luabinding & jsbinding automatically 2015-05-29 05:46:22 +00:00
CocosRobot 98b1700326 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-29 05:38:29 +00:00
子龙山人 45ad2665ae Merge pull request #12088 from andyque/v3 
[ci skip]add framework build scripts to gitignore
 2015-05-29 13:35:38 +08:00
andyque ebf6859161 add framework build scripts to gitignore 2015-05-29 13:34:59 +08:00
子龙山人 035420893e Merge pull request #12076 from andyque/update-changelog-v3 
Fix a memory issue in AudioEngine
 2015-05-29 11:44:45 +08:00
子龙山人 a968bc2d15 Merge pull request #12062 from jianglong0156/jsWebviewTest 
Js webview test
 2015-05-29 11:35:30 +08:00
Vincent Yang b714dde0ea Add opengl version project/unproject function in camera. 2015-05-29 10:44:48 +08:00
Dale Stammen 2f943aa7b1 updated properties 2015-05-28 15:30:17 -07:00
Dale Stammen f88ee25091 added Windows 10 UWP cpp template files 2015-05-28 15:27:29 -07:00
Dale Stammen 434cee5a66 added proj.win10 files 2015-05-28 15:26:28 -07:00
Dale Stammen d702012972 don't auto update version number for each windows app certification test 2015-05-28 15:04:09 -07:00
Dale Stammen 8584f5f399 removed old WP8 files 2015-05-28 15:03:36 -07:00
Dale Stammen 2a71407501 fixed double to float conversion compiler warning 2015-05-28 15:00:49 -07:00
Dale Stammen 05d33ac0c8 removed old WP8 files 2015-05-28 14:08:25 -07:00
Dale Stammen dadbbc18d6 added Windows 10 UWP project files 2015-05-28 13:51:25 -07:00