Dale Stammen
|
38b687f8d8
|
enable support for keyboard on winrt platforms to fix back button
|
2015-06-29 09:13:19 -07:00 |
pandamicro
|
15c763d84a
|
Update engine version
|
2015-06-29 18:21:06 +08:00 |
jianglong0156
|
11ac928f59
|
winrt use touch event replace mouse event
|
2015-06-25 17:44:03 +08:00 |
jianglong0156
|
c60e9dfc9e
|
winrt not suppot mouse
|
2015-06-25 17:25:27 +08:00 |
pandamicro
|
04af5dfbe3
|
#12494 Upgrade platform constants for WP8 & WINRT
|
2015-06-23 23:23:25 +08:00 |
江龙
|
7ff383e4d2
|
add the return value
|
2015-06-23 20:27:30 +08:00 |
pandamicro
|
ac138a3287
|
Merge pull request #12474 from xiaofeng11/v3_xiaofeng
Update 3d reader for compatible with cocosstudio 3.1.2 version csd file
|
2015-06-23 16:27:32 +08:00 |
XiaoFeng
|
befe97a78b
|
Update js parser for compatible with CocosStudio 2.3.2 json format export
|
2015-06-23 16:24:53 +08:00 |
子龙山人
|
8ca0f18575
|
Merge pull request #12446 from pandamicro/v3
Add auto bindings for navmesh
|
2015-06-19 17:21:00 +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 |
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
|
8e9fed936c
|
Add auto bindings
|
2015-06-19 10:36:36 +08:00 |
pandamicro
|
276ce3a0a7
|
Update versions
|
2015-06-19 09:56:19 +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 |
江龙
|
91bc19fb29
|
Merge branch 'v3_origin' into navmesh
Conflicts:
tests/js-tests/src/Physics3DTest/Physics3DTest.js
|
2015-06-18 23:50:19 +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 |
CocosRobot
|
ea2ec582f0
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-18 14:05:05 +00:00 |
CocosRobot
|
e2268bb16f
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-18 22:00:57 +08:00 |
CocosRobot
|
c069da629e
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-18 22:00:56 +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 |
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 |
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 |
jianglong0156
|
85c40b6580
|
Merge pull request #8 from pandamicro/physics3d
Physics3d
|
2015-06-18 14:54:32 +08:00 |
pandamicro
|
811173ea3b
|
Fix Physics3D test and js bindings
|
2015-06-18 14:33:16 +08:00 |
CocosRobot
|
b76db94725
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-18 05:43:02 +00:00 |
pandamicro
|
7952477469
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into physics3d
|
2015-06-18 12:05:01 +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
|
a94b49bdef
|
Add nav mesh bindings
|
2015-06-17 23:41:12 +08:00 |
pandamicro
|
85e8a407b1
|
Merge branch 'navmesh' of https://github.com/jianglong0156/cocos2d-x into v3
# Conflicts:
# tests/js-tests/project/Classes/AppDelegate.cpp
# tools/tojs/genbindings.py
|
2015-06-17 19:58:24 +08:00 |
samuele3hu
|
683812d817
|
Update Physics3D test for js.
|
2015-06-17 18:50:55 +08:00 |
jianglong0156
|
b265033a41
|
add testcase and manual bindings
|
2015-06-17 18:38:18 +08:00 |
jianglong0156
|
897b5fd0e9
|
add navmesh test project file and binding file
|
2015-06-17 18:37:19 +08:00 |
CocosRobot
|
22f04da582
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-17 07:18:18 +00:00 |
CocosRobot
|
55c7de75e9
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-17 06:48:41 +00:00 |
Jacky
|
3c5ab4f518
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon2
# Conflicts:
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
|
2015-06-17 13:04:24 +08:00 |
CocosRobot
|
6bed988354
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-17 03:47:36 +00:00 |
pandamicro
|
e4d5db30eb
|
Remove jsb_cocos2dx_experimental in projects to fix compilation issue
|
2015-06-16 15:09:06 +08:00 |
samuele3hu
|
a547d6aa33
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_navigation
Conflicts:
tools/bindings-generator
|
2015-06-16 11:36:11 +08:00 |
WuHao
|
27d0f51e9b
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
build/cocos2d_tests.xcodeproj/project.pbxproj
cocos/2d/libcocos2d.vcxproj.filters
tools/cocos2d-console
web
|
2015-06-15 16:13:36 +08:00 |