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 |
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 |
Vincent Yang
|
f8a5b1e18c
|
Fixed bug: UI component can't click correctly by moving UI and camera far away of origin.
|
2015-06-18 10:23:52 +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 |
Vincent Yang
|
0e0c8cf72e
|
Modify Scene3DTest to composite 2D/3D scene by moving UI and camera far away.
|
2015-06-18 09:54:48 +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 |