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
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
XiaoYang 96bb244d69 Merge pull request #351 from tangziwen/v3 
fix terraintest and Terrain::getInstersectionPoint()
 2015-06-18 14:47:49 +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
pandamicro 811173ea3b Fix Physics3D test and js bindings 2015-06-18 14:33:16 +08:00
WenhaiLin 05522afaa1 Fixed warn 2015-06-18 14:24:52 +08:00
CocosRobot b76db94725 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-18 05:43:02 +00:00
pandamicro 04ec7b2b9f Merge pull request #12420 from samuele3hu/v3_7_test 
Fix skip function error for Sprite.
 2015-06-18 13:33:49 +08:00
pandamicro 9dc52ba72f Merge pull request #12403 from VisualSJ/v3-aa 
[ci skip]Fixed some bug
 2015-06-18 12:31:27 +08:00
pandamicro 000be8316b Merge pull request #12415 from samuele3hu/v3_7_ui 
[ci skip]issue #12414:Add UIS9NinePatchTest for Lua and js
 2015-06-18 12:30:28 +08:00
tangziwen 1989de7a04 fix terraintest and Terrain::getInstersectionPoint() 2015-06-18 12:20:44 +08:00
pandamicro 7952477469 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into physics3d 2015-06-18 12:05:01 +08:00
pandamicro c046c1bf2d Merge pull request #12418 from dabingnn/v3_fixLinuxCompileBug 
fix compile error for linux
 2015-06-18 12:04:33 +08:00
samuele3hu ef1bccd926 Fix the error skip function error for Sprite. 2015-06-18 12:03:30 +08:00
VisualSJ 44c37c676e change the seek to time 2015-06-18 11:54:25 +08:00
pandamicro 764b0b5f67 Merge pull request #12417 from samuele3hu/v3_7_test 
[ci skip]Fix the bugs about the Physics3DTest for Lua.
 2015-06-18 11:21:18 +08:00
samuele3hu 6c749a77f2 Fix the bugs about the Physics3DTest for Lua. 2015-06-18 11:17:08 +08:00
Huabing.Xu 92824537ac fix compile error for linux 2015-06-18 11:15:45 +08:00
XiaoYang 0730e7a013 Merge pull request #350 from tangziwen/v3 
fix Scene3D test
 2015-06-18 10:25:46 +08:00
tangziwen 4187ea2241 fix Scene3D test 2015-06-18 10:17:46 +08:00
samuele3hu 7f21731bb1 Update UIS9NinePatchTest for jsb 2015-06-18 10:08:13 +08:00
jianglong0156 c5e9c1487b Merge pull request #7 from pandamicro/navmesh 
Navmesh
 2015-06-18 10:03:09 +08:00
samuele3hu 31ce264c6a Add a new line. 2015-06-18 09:44:47 +08:00
samuele3hu 8c01d94945 issue #12414:Add UIS9NinePatchTest for js 2015-06-18 09:43:05 +08:00
samuele3hu 31aae38fac issue #12414:Add UIS9NinePatchTest for Lua and js 2015-06-18 09:41:16 +08:00
VisualSJ 400b2d7663 Fixed a bug that xhr cross-domain error 2015-06-18 09:23:15 +08:00
pandamicro 3ffc0e6be6 Merge branch 'v3_navigation' of https://github.com/samuele3hu/cocos2d-x into physics3d 2015-06-18 09:20:37 +08:00
pandamicro 5a34133155 Merge pull request #12397 from pandamicro/v3 
Update submodules
 2015-06-18 08:13:58 +08:00
Ricardo Quesada 8c56859ca9 Merge pull request #12412 from MSOpenTech/v3-winrt-fix 
V3: Fix Windows 10 UWP build by adding missing external/clipper files
 2015-06-17 13:19:22 -07:00
Dale Stammen fd0605416e moved clipper files to external/clipper filter in VS solution 2015-06-17 11:48:56 -07:00
Dale Stammen 9ef92b71dd added missing external/clipper files. Removed obsolete files 2015-06-17 11:40:38 -07:00
pandamicro 3975d44d3b Chain NavMeshTest 2015-06-18 00:58:03 +08:00
pandamicro bcf9659408 Merge branch 'v3' into navmesh 2015-06-18 00:36:37 +08:00
pandamicro 5b23e8b381 Fix resource issue 2015-06-18 00:24:01 +08:00
pandamicro 6e7f1ce9dd Fix plugin compilation issue 2015-06-18 00:16:52 +08:00
pandamicro a94b49bdef Add nav mesh bindings 2015-06-17 23:41:12 +08:00