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 |
jianglong0156
|
05c40b13f9
|
fix the win32 head error
|
2015-06-18 21:30:30 +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 |
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 |
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 |
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 |
WuHao
|
6e138e7b9b
|
add clipper to cmakelist
|
2015-06-16 17:09:27 +08:00 |
WuHao
|
d3e0439972
|
Merge branch 'fix_spritepolygon2' of https://github.com/Wu-Hao/cocos2d-x into fix_spritepolygon
|
2015-06-16 16:15:57 +08:00 |
WuHao
|
3b56d2a66f
|
fix cmake for cmake platforms
|
2015-06-16 16:15:19 +08:00 |
Hao Wu
|
2ddad84c73
|
Merge pull request #17 from pandamicro/spritepolygon
Remove jsb_cocos2dx_experimental in projects to fix compilation issue
|
2015-06-16 15:11:36 +08:00 |
pandamicro
|
e4d5db30eb
|
Remove jsb_cocos2dx_experimental in projects to fix compilation issue
|
2015-06-16 15:09:06 +08:00 |
pandamicro
|
3f8923648b
|
Merge pull request #12359 from super626/opt_navigation
remove unused code, and use nullptr for pointer
|
2015-06-16 14:58:58 +08:00 |
Huabing.Xu
|
19982aae00
|
fix android background and foreground bug with VertexAttributeBinding
|
2015-06-16 14:04:50 +08:00 |
pandamicro
|
0866180918
|
Merge pull request #12162 from namezero111111/patch-4
JumpTo::clone() results in incorrect end position
|
2015-06-16 13:37:04 +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
|
aeeed0f4ab
|
Merge remote-tracking branch 'origin' into fix_spritepolygon
# Conflicts:
# external/config.json
|
2015-06-16 11:19:20 +08:00 |