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

29348 Commits

Author SHA1 Message Date
XiaoYang 39340c52ed Merge pull request #331 from tangziwen/v3 
fix crash when the visiting camera is not exist
 2015-05-19 15:01:34 +08:00
tangziwen 8d791390ff fix crash when visiting camera is not exist 2015-05-19 14:47:28 +08:00
yangxiao 5b8b4fed50 multiply scale before construct physics 2015-05-14 10:44:08 +08:00
yangxiao e659373648 add getTriangleList to bundle 2015-05-14 10:30:20 +08:00
yangxiao 0f0f85b33c terrain to 3d render queue 2015-05-14 10:29:50 +08:00
Ricardo Quesada e2cef9a3a7 Merge pull request #11826 from ricardoquesada/renderstate_parsing 
RenderState can be part of Material and Technique
 2015-05-13 14:57:51 -07:00
Ricardo Quesada aeea7ade14 RenderState can be part of Material and Technique 2015-05-13 14:12:37 -07:00
Ricardo Quesada 7bf550f38b Merge pull request #11825 from ricardoquesada/material_fixes 
fixes mipmap issue with parsing Sampler
 2015-05-13 12:13:02 -07:00
Ricardo Quesada e95de4de62 fixes mipmap issue with parsing Sampler 2015-05-13 10:24:32 -07:00
minggo 1007c0bfdb Merge pull request #11813 from CocosRobot/update_lua_bindings_1431504407 
[AUTO]: updating luabinding & jsbinding automatically
 2015-05-13 17:05:27 +08:00
minggo 43fb8d842b [ci skip]update AUTHORS 2015-05-13 17:04:55 +08:00
minggo 9e02b230c7 [ci skip]update CHANGELOG 2015-05-13 17:03:37 +08:00
minggo 3d0c7705f7 Merge pull request #11763 from Dimon4eg/v3 
Fix web view leak on iOS
 2015-05-13 17:02:50 +08:00
CocosRobot 6bf984f3d3 [AUTO]: updating luabinding & jsbinding automatically 2015-05-13 08:11:34 +00:00
minggo a7317ee387 Merge pull request #11811 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2015-05-13 16:02:47 +08:00
zhangbin e901918115 Update the reference of submodule cocos2d-console. 2015-05-13 14:07:10 +08:00
Ricardo Quesada f23b15c6d3 Merge pull request #11810 from ricardoquesada/api_fixes 
More material samples
 2015-05-12 23:03:40 -07:00
minggo 384c20f390 Merge pull request #11805 from super626/physics3d2 
pass parameter by reference
 2015-05-13 13:39:49 +08:00
minggo 50aa8dba47 Merge pull request #11806 from MSOpenTech/v3-winrt-ad-fix 
V3: updates to app.xaml code to correctly support touches on Microsoft Ads
 2015-05-13 13:39:29 +08:00
Ricardo Quesada c693573d77 more samples 
and API fixes
 2015-05-12 22:24:52 -07:00
Ricardo Quesada 33ee83deea Merge pull request #11809 from CocosRobot/update_cocosfiles_1431490029 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-05-12 21:11:36 -07:00
CocosRobot 5bf26f9f10 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-13 04:07:11 +00:00
Ricardo Quesada a83c10fdbf Merge pull request #11807 from ricardoquesada/material_vertexattrib 
Adds support of VertexAttribBinding per Pass
 2015-05-12 21:05:02 -07:00
Ricardo Quesada d23ff0ea2c Adds support of VertexAttribBinding per Pass 2015-05-12 19:58:09 -07:00
Dale Stammen 40c19b31c8 updates to app.xaml code to correctly support touches on Microsoft AdControls for WP8.1 2015-05-12 19:39:40 -07:00
yangxiao 68e6224688 Merge branch 'physics3d2' of https://github.com/super626/cocos2d-x into physics3d2 2015-05-13 10:14:12 +08:00
yangxiao f2eacc154b use reference param 2015-05-13 10:13:46 +08:00
minggo 0dc5df339d Merge pull request #11804 from CocosRobot/update_lua_bindings_1431480922 
[AUTO]: updating luabinding & jsbinding automatically
 2015-05-13 10:07:23 +08:00
minggo 5c227f4c92 Merge pull request #11528 from hobogenized/my_fix_branch 
Minor changes in variable names to fix Xcode warnings
 2015-05-13 10:03:33 +08:00
minggo 56d21b6040 Merge pull request #11680 from kaplad/vk_fix_logical_bug 
Fix a logical bug that may make wrong behavior
 2015-05-13 09:41:20 +08:00
CocosRobot 68e5bae330 [AUTO]: updating luabinding & jsbinding automatically 2015-05-13 01:39:56 +00:00
minggo 0ef01edcc7 Merge pull request #11803 from CocosRobot/update_cocosfiles_1431481051 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-05-13 09:38:45 +08:00
minggo a587b28e38 Merge pull request #11792 from super626/v3 
particle3d can not be seen when added to scene with terrain
 2015-05-13 09:38:21 +08:00
CocosRobot 90ce442616 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-13 01:37:33 +00:00
minggo 9a479b59f8 Merge pull request #11800 from WenhaiLin/v3-pt-sprite 
Fix the performance test of sprite
 2015-05-13 09:37:27 +08:00
minggo 5e87bd307b Merge pull request #11798 from WenhaiLin/v3-support-vs2015 
Add support for visual studio 2015.
 2015-05-13 09:37:12 +08:00
minggo b51f78aa42 Merge pull request #11797 from super626/physics3d2 
fix wrong indent and add const
 2015-05-13 09:36:51 +08:00
minggo b0c7531897 Merge pull request #11795 from CocosRobot/update_lua_bindings_1431410101 
[AUTO]: updating luabinding & jsbinding automatically
 2015-05-13 09:35:25 +08:00
minggo 14605301ef [ci skip]update CHANGELOG 2015-05-13 09:33:56 +08:00
minggo f180624aaf Merge pull request #11802 from MSOpenTech/v3-winrt-keyboard 
Updated winrt keyboard support to support physical keyboard
 2015-05-13 09:31:35 +08:00
Dale Stammen f1fe802442 updated winrt keyboard support to support physical keyboard 2015-05-12 09:20:10 -07:00
Wenhai Lin 7af99d1991 Fix the performance test of sprite 2015-05-12 17:59:22 +08:00
WenhaiLin 461241839d Fixed compile error on visual studio 2015. 2015-05-12 17:04:56 +08:00
XiaoYang 1267a95202 Merge pull request #328 from songchengjiang/physics3d2 
add libbullet for template project
 2015-05-12 16:51:54 +08:00
WenhaiLin e53a977439 Add support for visual studio 2015. 2015-05-12 16:46:09 +08:00
songchengjiang 4756647016 add libbullet for template project 2015-05-12 16:34:10 +08:00
WenhaiLin c70bac7bb4 Add support for visual studio 2015. 2015-05-12 16:26:28 +08:00
yangxiao 806d64dced fix wrong indent and add const 2015-05-12 16:13:14 +08:00
CocosRobot dbb51e2367 [AUTO]: updating luabinding & jsbinding automatically 2015-05-12 05:59:42 +00:00
minggo cdfce7fcae Merge pull request #11791 from CocosRobot/update_lua_bindings_1431407875 
[AUTO]: updating luabinding & jsbinding automatically
 2015-05-12 13:51:32 +08:00