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
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
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
Jialong Zhai 9cf5c1b636 fix material test 2015-05-29 13:54:29 +08:00
Huabing.Xu 1fb0ba112b init code for viewport 2015-05-29 13:47: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
jianglong0156 722b6b1baf add video player binding files 2015-05-29 11:39:47 +08:00
子龙山人 a968bc2d15 Merge pull request #12062 from jianglong0156/jsWebviewTest 
Js webview test
 2015-05-29 11:35:30 +08:00
jianglong0156 8b52563a8a add videoplayer config ini and fix the url bug 2015-05-29 11:10:39 +08:00
Vincent Yang b714dde0ea Add opengl version project/unproject function in camera. 2015-05-29 10:44:48 +08:00
Huabing.Xu 22ddf53539 Merge branch 'v3FrameBufferObject' into v3 2015-05-29 10:38:42 +08:00
Huabing.Xu df09bef567 use a different size to create fbo 2015-05-29 10:00: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
Dale Stammen 60f672599b added winrt networking files 2015-05-28 13:48:13 -07:00
Dale Stammen 2aec149316 check for existance of KEY_DOWNLOAD_STATE entry before trying to read its value 2015-05-28 13:33:38 -07:00
Dale Stammen 736de4e37c fixed compiler warning for double to float conversion 2015-05-28 13:32:40 -07:00
Dale Stammen 7623ee390b disable CURL and AssetsManager for Windows 10 UWP 2015-05-28 13:32:08 -07:00
Dale Stammen 962393233f removed old winrt property sheets 2015-05-28 13:12:37 -07:00
子龙山人 0838aa28aa Merge pull request #12069 from hugohuang1111/v3_del_duplicate_fw_file 
[M] remove duplicate file of framework
 2015-05-28 23:09:29 +08:00
jianglong0156 9a62d06091 add video player test and auto bindings 2015-05-28 18:10:07 +08:00