子龙山人
|
e0ea8a460a
|
Merge pull request #12454 from andyque/improve-samsung-api-docs
[ci skip]add more docs for samsung enhanced API
|
2015-06-19 18:11:15 +08:00 |
andyque
|
55b86b2e14
|
add more docs for samsung enhanced API
|
2015-06-19 18:09:42 +08:00 |
pandamicro
|
77fefbfd16
|
Merge pull request #12453 from CocosRobot/update_lua_bindings_1434707583
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-19 18:05:28 +08:00 |
CocosRobot
|
c635881257
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-19 09:59:19 +00:00 |
pandamicro
|
f75809f913
|
Merge pull request #12452 from natural-law/framework
[ci skip] Solve the error in the scripts of modify templates for framework.
|
2015-06-19 17:48:48 +08:00 |
Bin Zhang
|
53ca264eff
|
Solve the error in the scripts of modify templates for framework.
|
2015-06-19 17:43:06 +08:00 |
子龙山人
|
8e1a70fffd
|
Merge pull request #12450 from CocosRobot/update_cocosfiles_1434705879
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-06-19 17:33:01 +08:00 |
CocosRobot
|
7486c74209
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-06-19 09:24:40 +00:00 |
子龙山人
|
8ca0f18575
|
Merge pull request #12446 from pandamicro/v3
Add auto bindings for navmesh
|
2015-06-19 17:21:00 +08:00 |
子龙山人
|
776dd1dd09
|
Merge pull request #12449 from WenhaiLin/v3-37-resoucesfix
[ci skip]Fixed resources.
|
2015-06-19 16:30:05 +08:00 |
WenhaiLin
|
45de0b650a
|
[ci skip]Fixed resources.
|
2015-06-19 16:26:03 +08:00 |
子龙山人
|
869e3c5243
|
Merge pull request #12444 from WenhaiLin/v3-37-label-linewrapfix
Label:Fixed line wrap error without space.
|
2015-06-19 15:08:13 +08:00 |
pandamicro
|
7b1694bfeb
|
Merge pull request #12443 from VisualSJ/v3-aa
[ci skip]Studio parser: Code for defense
|
2015-06-19 14:24:39 +08:00 |
pandamicro
|
8afba07820
|
Merge pull request #12445 from natural-law/framework
[ci skip] Optimize the implementation of framework-compile scripts.
|
2015-06-19 13:48:11 +08:00 |
Bin Zhang
|
146b99fda8
|
Support build VS project with VS2013 & VS2015.
|
2015-06-19 13:42:48 +08:00 |
Bin Zhang
|
b01ef05797
|
Add parameter --app-abi to set the APP_ABI value of ndk-build.
|
2015-06-19 13:42:48 +08:00 |
Bin Zhang
|
cd159bd12c
|
Add a config file for generating prebuilt libs.
|
2015-06-19 13:42:48 +08:00 |
WenhaiLin
|
d32a317ea0
|
Label:Fixed line wrap error without space.
|
2015-06-19 13:39:19 +08:00 |
VisualSJ
|
8fa755d0e4
|
Studio parser: Code for defense
|
2015-06-19 13:15:10 +08:00 |
VisualSJ
|
ea0ab5c738
|
Studio parser: Code for defense
|
2015-06-19 11:13:07 +08:00 |
pandamicro
|
f6abca383e
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2015-06-19 10:44:27 +08:00 |
pandamicro
|
1bf8292e06
|
Merge pull request #12442 from natural-law/update-templates
Update the VS projects of templates.
|
2015-06-19 10:38:02 +08:00 |
pandamicro
|
8e9fed936c
|
Add auto bindings
|
2015-06-19 10:36:36 +08:00 |
pandamicro
|
ca989e2aed
|
Fix physics3d js test issue
|
2015-06-19 10:35:45 +08:00 |
pandamicro
|
63e02ce4d9
|
Merge pull request #12441 from pandamicro/v3
[ci skip] Update versions
|
2015-06-19 09:56:51 +08:00 |
pandamicro
|
276ce3a0a7
|
Update versions
|
2015-06-19 09:56:19 +08:00 |
子龙山人
|
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 |