yangxiao
|
bfdb06e31b
|
add empty line
|
2015-06-23 18:31:20 +08:00 |
yangxiao
|
c3593c9d64
|
merge cocos
|
2015-06-23 18:29:39 +08:00 |
pandamicro
|
60372056ce
|
Merge pull request #12484 from andyque/fix-nine-patch-image-error
fix nine patch image parser error on Windows.
|
2015-06-23 18:26:16 +08:00 |
yangxiao
|
251c81d7be
|
Merge branch 'newcode' into v3
|
2015-06-23 18:25:41 +08:00 |
pandamicro
|
2a0c2b6e32
|
Merge pull request #12250 from hawkwood/patch-10
Fails if file does not exist
|
2015-06-23 17:32:47 +08:00 |
WenhaiLin
|
f95245312a
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-37alpha0
|
2015-06-23 17:08:25 +08:00 |
pandamicro
|
4c7f33e66f
|
Merge pull request #12481 from jianglong0156/restartGameBug
fix Restart game bug
|
2015-06-23 17:02:09 +08:00 |
WenhaiLin
|
cbb073e905
|
Fixed Application may be created more than once on Android.
|
2015-06-23 16:58:38 +08:00 |
XiaoYang
|
59e6b6fdc2
|
Merge pull request #352 from tangziwen/v3
Using ray-triangle intersect test instead of the newton method
|
2015-06-23 16:30:18 +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 |
tangziwen
|
5b857f7d66
|
fix some bug
|
2015-06-23 16:11:00 +08:00 |
andyque
|
7fff2bd3c4
|
fix nine patch image parser error on Windows.
|
2015-06-23 15:42:58 +08:00 |
子龙山人
|
fca9b89a4c
|
Merge pull request #12480 from andyque/fix-rapidjson-assert-error
fix rapidjson assert error
|
2015-06-23 15:34:47 +08:00 |
pandamicro
|
f617d6f1aa
|
Merge pull request #12478 from WenhaiLin/v3-37-label-sfFix
Label:Fixed IllegalArgumentException on Android 2.3.x
|
2015-06-23 15:27:43 +08:00 |
Vincent Yang
|
4b768c5fd8
|
fixbug: cpp-test -> NewRenderer (drag the layer to test the result of culling), some object will be culling before out of screen.
|
2015-06-23 15:22:27 +08:00 |
jianglong0156
|
90f9bf37cd
|
fix redmine issue #20277 RestartGameTest only used in native will crash
|
2015-06-23 14:41:41 +08:00 |
tangziwen
|
1e016dc6d8
|
Always get the minimum distance intersect point.
|
2015-06-23 14:41:20 +08:00 |
tangziwen
|
f71ca4f179
|
Using ray-triangle intersect test instead of the newton method
|
2015-06-23 14:27:19 +08:00 |
andyque
|
70b709f4a8
|
fix rapidjson assert error
|
2015-06-23 13:54:11 +08:00 |
WenhaiLin
|
79aa300448
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-37alpha0
|
2015-06-23 13:42:32 +08:00 |
WenhaiLin
|
b275ce2283
|
Label:Fixed IllegalArgumentException on Android 2.3.x
|
2015-06-23 13:38:06 +08:00 |
pandamicro
|
9445aeacb7
|
Merge pull request #12456 from super626/camera
quaternion instead of euler angle
|
2015-06-23 13:16:39 +08:00 |
XiaoFeng
|
375e80bd70
|
Update 3d reader for compatible with cocosstudio 3.1.2 version csd file
Update easing default speed
|
2015-06-23 11:31:16 +08:00 |
子龙山人
|
6bd61a3a5f
|
Merge pull request #12469 from WenhaiLin/v3-37-label-lineheightfix
Label should be invisible when the line height is set to zero.
|
2015-06-23 11:02:48 +08:00 |
WenhaiLin
|
fbe1bd8253
|
Label should be invisible when the line height is set to zero.
|
2015-06-23 09:42:48 +08:00 |
Anniruddh
|
4a15d57093
|
Fixed issue #168
|
2015-06-20 00:20:15 -07:00 |
yangxiao
|
d252250968
|
quaternion instead of euler angle
|
2015-06-19 18:46:14 +08:00 |
andyque
|
55b86b2e14
|
add more docs for samsung enhanced API
|
2015-06-19 18:09:42 +08:00 |
子龙山人
|
8ca0f18575
|
Merge pull request #12446 from pandamicro/v3
Add auto bindings for navmesh
|
2015-06-19 17:21:00 +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 |
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
|
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 |
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 |
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 |
Huabing.Xu
|
b17702e6f1
|
fix compile error for linux
|
2015-06-18 22:00:55 +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 |
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
|
4d588c7837
|
Merge pull request #12423 from WenhaiLin/v3-37alpha0-warnfix
Fixed warn
|
2015-06-18 15:09:36 +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
|
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 |
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 |
Huabing.Xu
|
92824537ac
|
fix compile error for linux
|
2015-06-18 11:15:45 +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 |
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
|
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 |
pandamicro
|
bb275351f0
|
Merge pull request #12363 from super626/v3
Fix terrain lod computing bugs
|
2015-06-17 17:49:39 +08:00 |
yangxiao
|
12a352a1db
|
add comment
|
2015-06-17 16:32:08 +08:00 |
XiaoYang
|
5dd2aa2884
|
Merge pull request #349 from tangziwen/v3
fix camera position
|
2015-06-17 16:01:02 +08:00 |
tangziwen
|
e9c95229e0
|
fix camera position
|
2015-06-17 15:58:17 +08:00 |
pandamicro
|
b534f85679
|
Merge pull request #12394 from CocosRobot/update_lua_bindings_1434525200
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-17 15:38:17 +08:00 |
CocosRobot
|
22f04da582
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-17 07:18:18 +00:00 |
pandamicro
|
6f6c317f87
|
Merge pull request #12386 from WenhaiLin/v3-label-spacefix
Label:Fixed wrong letter spacing with outline enabled
|
2015-06-17 15:16:49 +08:00 |
pandamicro
|
5ee22c4142
|
Merge pull request #12174 from pajeroquan/v3
Fix JNI object memory leak!
|
2015-06-17 15:14:36 +08:00 |
pandamicro
|
b1831ea5fb
|
Merge pull request #12384 from chengstory/GBKToUTF8_v3
GBKToUTF8
|
2015-06-17 15:09:15 +08:00 |
CocosRobot
|
55c7de75e9
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-17 06:48:41 +00:00 |
Wenhai Lin
|
cbd428f6ac
|
Label:Fixed wrong letter spacing with outline enabled
|
2015-06-17 13:57:23 +08:00 |
zhangcheng
|
1c983f1f39
|
GBKToUTF8
|
2015-06-17 13:16:06 +08: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 |
子龙山人
|
0915565b8d
|
Merge pull request #12373 from samuele3hu/v3_navigation
Add the Lua bindings for NavMesh and the related test case.
|
2015-06-17 11:36:52 +08:00 |
Jacky
|
13e0fb22f5
|
fix compile on linux platform.
|
2015-06-17 11:34:19 +08:00 |
songchengjiang
|
c08a355a06
|
fix the bug of light
replace atanf with atan2f
|
2015-06-17 11:17:46 +08:00 |
pandamicro
|
a2deddcf59
|
Merge pull request #12361 from dabingnn/v3_androidBugForVertexAttrib
fix android background and foreground bug with VertexAttributeBinding
|
2015-06-17 09:34:47 +08:00 |
Dale Stammen
|
eb2bc78970
|
Merge branch 'v3' into v3-winrt-librecast
|
2015-06-16 07:13:53 -07:00 |
tangziwen
|
60115b1ce1
|
update
|
2015-06-16 17:46:21 +08:00 |
tangziwen
|
0eaf9b5acc
|
Fix camera's incorrect position in chunks' LOD calculating.
|
2015-06-16 17:29:43 +08:00 |