Ricardo Quesada
324a9bd694
Merge pull request #11790 from CocosRobot/update_cocosfiles_1431407733
...
[AUTO][ci skip]: updating cocos2dx_files.json
2015-05-11 22:24:31 -07:00
CocosRobot
a7fb56de69
[AUTO]: updating luabinding & jsbinding automatically
2015-05-12 05:23:45 +00:00
CocosRobot
507e94b77f
[AUTO][ci skip]: updating cocos2dx_files.json
2015-05-12 05:15:34 +00:00
Ricardo Quesada
17265fe9e6
Merge pull request #11789 from ricardoquesada/material_properties
...
Material uses new file format
2015-05-11 22:12:44 -07:00
Ricardo Quesada
1937431596
Material uses new file format
...
The new file format is easier to read and less error prone
It also fixes many bugs and adds new test cases
2015-05-11 21:31:33 -07:00
XiaoYang
88c6eb6887
Merge pull request #326 from songchengjiang/v3
...
fix the bug of particle3d material reading
2015-05-12 12:23:32 +08:00
yangxiao
4d71175318
resove conflict
2015-05-12 12:12:29 +08:00
songchengjiang
a30f4cfb14
Merge branch 'v3' of https://github.com/songchengjiang/cocos2d-x into v3
2015-05-12 10:44:24 +08:00
songchengjiang
24d1b23816
fix the bug of particle3d material reading
2015-05-12 10:42:33 +08:00
joshuastray
7a4ca3fe6a
add new files to project
2015-05-12 10:40:51 +08:00
minggo
5d0fc22d28
Merge pull request #11782 from WenhaiLin/v3-label-outline
...
Label:Fixed the characters with outline not on the same base line.
2015-05-12 09:46:26 +08:00
Vladislav Kaplun
f67b4761da
Fix a logical bug that may wrong behavior
2015-05-11 15:15:00 +03:00
minggo
a9cfac546c
Merge pull request #11779 from CocosRobot/update_lua_bindings_1431332990
...
[AUTO]: updating luabinding & jsbinding automatically
2015-05-11 18:27:00 +08:00
minggo
b5d932668c
Merge pull request #11778 from WenhaiLin/v3-per-test
...
Put back the test cases of performance.
2015-05-11 18:16:37 +08:00
WenhaiLin
7e0dc7482b
Label:Fixed the characters with outline not on the same base line.
2015-05-11 18:05:03 +08:00
WenhaiLin
1e1d14ec40
Remove unused variable.
2015-05-11 17:33:27 +08:00
minggo
21ab28fec3
Merge pull request #11777 from CocosRobot/update_lua_bindings_1431332000
...
[AUTO]: updating luabinding & jsbinding automatically
2015-05-11 17:25:57 +08:00
joshuastray
234f4db8a0
add SpritePolygon binding && js tests
2015-05-11 17:04:23 +08:00
CocosRobot
e325a3b746
[AUTO]: updating luabinding & jsbinding automatically
2015-05-11 08:33:55 +00:00
WenhaiLin
22d04c7c39
Put back the test cases of performance.
2015-05-11 16:26:14 +08:00
minggo
1129949722
Merge pull request #11772 from CocosRobot/update_lua_bindings_1431309376
...
[AUTO]: updating luabinding & jsbinding automatically
2015-05-11 16:24:22 +08:00
CocosRobot
98fbec8dfd
[AUTO]: updating luabinding & jsbinding automatically
2015-05-11 08:17:21 +00:00
minggo
bcd57c3d90
Merge pull request #11776 from samuele3hu/v3_physics3d
...
Add macro limitation for Physic3D related
2015-05-11 16:09:19 +08:00
samuele3hu
9e9494ded0
Add limited macro for related Physic3D
2015-05-11 15:34:37 +08:00
Vincent Yang
761da2fd20
Scene3DTest ok.
2015-05-11 14:41:50 +08:00
Thomas
ff4475e8fd
Merge pull request #325 from songchengjiang/v3
...
fix bugs of terrain
2015-05-11 13:46:05 +08:00
songchengjiang
f25c02f230
fix bugs of terrain
2015-05-11 12:02:32 +08:00
CocosRobot
b5e9986d17
[AUTO]: updating luabinding & jsbinding automatically
2015-05-11 02:00:41 +00:00
minggo
aaa3526ee2
Merge pull request #11770 from MSOpenTech/v3-winrt-fix
...
V3: removed CC_PLATFORM_WP8 from source code
2015-05-11 09:47:59 +08:00
Dale Stammen
351a898a70
removed CC_PLATFORM_WP8
2015-05-08 09:19:13 -07:00
cpascal
382fd48b6a
Fixed ogg filepath has unicode in Win32
...
In Win32, you can't play ogg file if the path contains unicode.
mpg123 library accepts utf8 filepath, but ogg(Vorbisfile) library
accepts ACP(ANSI CodePage) in Win32 environment.
2015-05-08 21:48:21 +09:00
dkorchinskiy
a71ef98275
Fix web view leak on iOS
2015-05-08 15:19:14 +03:00
Vincent Yang
8a7b7589d5
Merge branch 'v3_addClearforCamera' of https://github.com/dabingnn/cocos2d-x into v3_addClearforCamera
2015-05-08 18:28:45 +08:00
Vincent Yang
3bf16dcc4d
Add skybox and partile 3d in Scene3DTest.
2015-05-08 18:28:12 +08:00
minggo
38b0cf7bf1
[ci skip]update CHANGELOG
2015-05-08 17:04:52 +08:00
minggo
60be9e0039
Merge pull request #11760 from CocosRobot/update_cocosfiles_1431075754
...
[AUTO][ci skip]: updating cocos2dx_files.json
2015-05-08 17:03:57 +08:00
CocosRobot
299e355152
[AUTO][ci skip]: updating cocos2dx_files.json
2015-05-08 09:02:36 +00:00
minggo
50dc2a3e49
Merge pull request #11758 from super626/physics3d2
...
add physics3d support using bullet 2.82
2015-05-08 16:58:28 +08:00
yangxiao
c6d3991a03
wrong character
2015-05-08 15:56:48 +08:00
yangxiao
2391558c96
add physics3d support
2015-05-08 15:49:33 +08:00
minggo
13199a0aac
Merge pull request #11757 from andyque/v3
...
improve jenkins workflow
2015-05-08 15:32:35 +08:00
andyque
2575130b33
improve jenkins workflow
2015-05-08 14:44:43 +08:00
Huabing.Xu
713831ca76
fix rendering of camera clear quad
2015-05-08 14:21:23 +08:00
minggo
f0e16bba71
Merge pull request #11756 from CocosRobot/update_cocosfiles_1431065607
...
[AUTO][ci skip]: updating cocos2dx_files.json
2015-05-08 14:20:46 +08:00
CocosRobot
a3b8f6bcb1
[AUTO][ci skip]: updating cocos2dx_files.json
2015-05-08 06:13:28 +00:00
minggo
bf93289718
Merge pull request #11751 from samuele3hu/v3_7_remove_vs2012
...
Remove vs2012 support in v3
2015-05-08 14:11:13 +08:00
Vincent Yang
966f3b6a3f
Add terrain in Scene3DTest.
2015-05-08 11:46:27 +08:00
minggo
64de69f94a
Merge pull request #11754 from CocosRobot/update_cocosfiles_1431053159
...
[AUTO][ci skip]: updating cocos2dx_files.json
2015-05-08 11:15:41 +08:00
samuele3hu
adea931542
Update 3rd library to 50
2015-05-08 11:12:42 +08:00
minggo
1cfb8c88a6
[ci skip]update AUTHORS
2015-05-08 10:46:20 +08:00