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

29334 Commits

Author SHA1 Message Date
joshuastray 59c0a64d38 add libbullet to js template 2015-05-14 10:01:22 +08: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
minggo a47a8bbb30 Merge pull request #11793 from CocosRobot/update_cocosfiles_1431409787 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-05-12 13:51:08 +08:00
CocosRobot d170a79919 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-12 05:49:49 +00:00
minggo 398d36b58a Merge pull request #11788 from joshuastray/spritepolygon 
SpritePolygon binding and tests for js
 2015-05-12 13:46:22 +08:00
yangxiao 2c2589c34f modify change log 2015-05-12 13:25:47 +08:00
Ricardo Quesada 324a9bd694 Merge pull request #11790 from CocosRobot/update_cocosfiles_1431407733 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-05-11 22:24:31 -07:00
CocosRobot a7fb56de69 [AUTO]: updating luabinding & jsbinding automatically 2015-05-12 05:23:45 +00:00
CocosRobot 507e94b77f [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-12 05:15:34 +00:00
Ricardo Quesada 17265fe9e6 Merge pull request #11789 from ricardoquesada/material_properties 
Material uses new file format
 2015-05-11 22:12:44 -07:00
Ricardo Quesada 1937431596 Material uses new file format 
The new file format is easier to read and less error prone
It also fixes many bugs and adds new test cases
 2015-05-11 21:31:33 -07:00
XiaoYang 88c6eb6887 Merge pull request #326 from songchengjiang/v3 
fix the bug of particle3d material reading
 2015-05-12 12:23:32 +08:00
yangxiao 4d71175318 resove conflict 2015-05-12 12:12:29 +08:00
songchengjiang a30f4cfb14 Merge branch 'v3' of https://github.com/songchengjiang/cocos2d-x into v3 2015-05-12 10:44:24 +08:00
songchengjiang 24d1b23816 fix the bug of particle3d material reading 2015-05-12 10:42:33 +08:00