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

30636 Commits

Author SHA1 Message Date
江龙 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
samuele3hu be870bd42a Merge branch 'navigation2' of https://github.com/super626/cocos2d-x into v3_navigation 2015-06-01 11:26:08 +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
samuele3hu c3ea65e66b Merge branch 'navigation2' of https://github.com/super626/cocos2d-x into v3_navigation 2015-05-29 18:25:15 +08:00
WuHao 3d62805d04 Merge branch 'v3' into fix_spritepolygon 
# Conflicts:
#	build/cocos2d_libs.xcodeproj/project.pbxproj
#	cocos/2d/MarchingSquare.cpp
 2015-05-29 18:10:41 +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
Jacky e69a6116fa make SpritePolygonInfo extend from Ref. 2015-05-29 16:44:06 +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
yangxiao db2b2cf0b8 getTrianglesList for obj file 2015-05-29 16:37:37 +08:00
Huabing.Xu b5e76c7521 Merge branch 'v3_origin' into v3FrameBufferObject 2015-05-29 15:59:38 +08:00
Huabing.Xu f76585f046 Merge branch 'v3' into v3FrameBufferObject 2015-05-29 15:59:15 +08:00
Huabing.Xu 9bf15877e5 add applyViewport in camera. 2015-05-29 15:52:06 +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
Michael Sotnikov b430353cd8 Fixed: #12097 VideoPlayer on Android ignores search paths 2015-05-29 10:17:40 +03:00
Jacky 8df4920f6e fixed file name. 2015-05-29 15:03:36 +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
Huabing.Xu 2f32fcabba Merge branch 'v3FrameBufferObject' into v3Viewport 2015-05-29 14:10:49 +08:00
Huabing.Xu b2579a754a refactor, use Camera::apply() to apply Rendertarget and Viewport 2015-05-29 14:08:20 +08: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