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

30407 Commits

Author SHA1 Message Date
子龙山人 28b4a20cfd Merge pull request #12440 from CocosRobot/update_cocosfiles_1434677243 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-06-19 09:29:52 +08:00
CocosRobot b64c2c13d0 [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-19 01:27:24 +00:00
pandamicro 2a7386757e Merge pull request #12438 from pandamicro/navmesh 
Bind Navmesh in JSB and add test case
 2015-06-19 09:23:21 +08:00
pandamicro c6d4f283bb Fix compilation issue in navmesh conversion 2015-06-19 08:11:45 +08:00
pandamicro f405d00336 Fix linux compilation 2015-06-19 01:14:16 +08:00
pandamicro 47a03dea2b Merge pull request #12437 from pandamicro/v3 
Update web engine version
 2015-06-19 00:55:49 +08:00
pandamicro e0e5370f89 Update web engine version 2015-06-19 00:14:36 +08:00
江龙 91bc19fb29 Merge branch 'v3_origin' into navmesh 
Conflicts:
	tests/js-tests/src/Physics3DTest/Physics3DTest.js
 2015-06-18 23:50:19 +08:00
江龙 49d81a4537 Merge branch 'v3_origin' into navmesh 2015-06-18 23:31:18 +08:00
江龙 8fc5835dee modify linux file 2015-06-18 23:29:04 +08:00
江龙 61db9ef103 modify cocos2d_specifics ， add navmesh head file。 modify template。add navmesh head file and register code 2015-06-18 23:21:53 +08:00
江龙 8c97fec5af add navmesh project file path 2015-06-18 23:17:49 +08:00
jianglong0156 618d8f01e8 Merge pull request #9 from pandamicro/navmesh 
Improve bindings for navmesh
 2015-06-18 23:15:05 +08:00
pandamicro b757837239 Move NavMesh to jsb namespace 2015-06-18 22:57:41 +08:00
jianglong0156 56382aae37 winphone project 2015-06-18 22:50:24 +08:00
pandamicro deaa048521 Improve auto bindings for navmesh 2015-06-18 22:48:47 +08:00
pandamicro 86d2fa5abf Merge pull request #12433 from CocosRobot/update_lua_bindings_1434635998 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-06-18 22:07:14 +08:00
CocosRobot ea2ec582f0 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-18 14:05:05 +00:00
Bin Zhang a4ecfdb7e2 Build engine with LOCAL_ARM_MODE=arm when building JS projects for android. 2015-06-18 22:00:57 +08:00
CocosRobot e2268bb16f [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-18 22:00:57 +08:00
Bin Zhang 35842e1d2a Update the reference of submodule cocos2d-console. 2015-06-18 22:00:56 +08:00
pandamicro 4073d0397b Update bindings generator 2015-06-18 22:00:56 +08:00
WenhaiLin e2f834e96b Fixed warn 2015-06-18 22:00:56 +08:00
CocosRobot c069da629e [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-18 22:00:56 +08:00
samuele3hu 0806e58255 Fix the error skip function error for Sprite. 2015-06-18 22:00:55 +08:00
VisualSJ 3da67d3358 change the seek to time 2015-06-18 22:00:55 +08:00
Huabing.Xu b17702e6f1 fix compile error for linux 2015-06-18 22:00:55 +08:00
samuele3hu a98b493151 Update UIS9NinePatchTest for jsb 2015-06-18 22:00:55 +08:00
samuele3hu cbfa92d3fd Add a new line. 2015-06-18 22:00:55 +08:00
samuele3hu 496ce50ff5 issue #12414:Add UIS9NinePatchTest for js 2015-06-18 22:00:55 +08:00
samuele3hu 77c3e9bdde issue #12414:Add UIS9NinePatchTest for Lua and js 2015-06-18 22:00:54 +08:00
VisualSJ 0a526875a8 Fixed a bug that xhr cross-domain error 2015-06-18 22:00:54 +08:00
VisualSJ 82c09e8d0c Fixed a bug that xhr cross-domain error 2015-06-18 22:00:54 +08:00
pandamicro cd7252014a Merge pull request #12432 from pandamicro/v3 
Change physics3d api to jsb namespace
 2015-06-18 21:53:39 +08:00
pandamicro e09ba8080f Fix create Sprite with PolygonInfo issue 2015-06-18 21:48:57 +08:00
jianglong0156 05c40b13f9 fix the win32 head error 2015-06-18 21:30:30 +08:00
pandamicro 10a8adad53 Change physics3d api to jsb namespace 2015-06-18 20:39:40 +08:00
pandamicro 491d89baec Merge pull request #12429 from natural-law/v3 
Build engine with LOCAL_ARM_MODE=arm when building JS projects for android.
 2015-06-18 20:28:52 +08:00
jianglong0156 e0b66707f9 add nerviest android file 2015-06-18 19:30:05 +08:00
jianglong0156 4fe1542d17 add navmesh tests 2015-06-18 19:22:27 +08:00
Bin Zhang d288b13957 Build engine with LOCAL_ARM_MODE=arm when building JS projects for android. 2015-06-18 17:22:30 +08:00
pandamicro afa88c7823 Merge pull request #12427 from CocosRobot/update_lua_bindings_1434615189 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-06-18 17:06:10 +08:00
CocosRobot 6e849a158d [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-18 08:18:00 +00:00
pandamicro aa566a3722 Merge pull request #12424 from pandamicro/physics3d 
Fix Physics3D test and js bindings
 2015-06-18 16:09:49 +08:00
pandamicro 5f025031a1 Merge pull request #12425 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2015-06-18 15:39:59 +08:00
Bin Zhang 38ad8ca938 Update the reference of submodule cocos2d-console. 2015-06-18 15:38:17 +08:00
pandamicro 4d588c7837 Merge pull request #12423 from WenhaiLin/v3-37alpha0-warnfix 
Fixed warn
 2015-06-18 15:09:36 +08:00
pandamicro cf3b49f4fd Update bindings generator 2015-06-18 15:08:39 +08:00
jianglong0156 85c40b6580 Merge pull request #8 from pandamicro/physics3d 
Physics3d
 2015-06-18 14:54:32 +08:00
pandamicro a14fd25436 Merge pull request #12421 from CocosRobot/update_lua_bindings_1434605863 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-06-18 14:45:02 +08:00