Commit Graph

29436 Commits

Author SHA1 Message Date
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
CocosRobot 745fe13ecb [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-08 02:46:01 +00:00
minggo 82bcb171a2 Merge pull request #11747 from Dimon4eg/v3
Fix crash in AssetsManager
2015-05-08 10:44:06 +08:00
minggo b6ec472985 [ci skip]update CHANGELOG 2015-05-08 10:43:40 +08:00
minggo 14cebf7150 Merge pull request #11750 from CocosRobot/update_lua_bindings_1431050321
[AUTO]: updating luabinding & jsbinding automatically
2015-05-08 10:42:31 +08:00
minggo d587ffd5c0 Merge pull request #11736 from samuele3hu/v3_7_js
issue 10411:Bug in Physics manual Lua binding
2015-05-08 10:04:55 +08:00
CocosRobot 4195c4b250 [AUTO]: updating luabinding & jsbinding automatically 2015-05-08 02:03:02 +00:00
minggo 5140afe24c Merge pull request #11715 from cnsoft/cnsoft-patch-1
try to fix a nullptr bug.
2015-05-08 09:55:13 +08:00
minggo 09ddf15b9f Merge pull request #11740 from joshuastray/fix-debu
fix jsb debugger bug
2015-05-08 09:29:40 +08:00
dkorchinskiy 0f30ad4f16 Fix crash in AssetsManager 2015-05-07 18:59:51 +03:00
Vincent Yang 6f50708beb Merge branch 'v3_addClearforCamera' of https://github.com/dabingnn/cocos2d-x into v3_addClearforCamera 2015-05-07 18:43:27 +08:00
Vincent Yang 60aa223065 Add dialog in Scene3DTest. 2015-05-07 18:43:07 +08:00
Huabing.Xu f064587ae5 refactor camera clear to immediate rendering 2015-05-07 18:32:32 +08:00
Jialong Zhai be923b5901 fix jsb debugger bug 2015-05-07 18:24:30 +08:00
Vincent Yang 1daca7fac9 Merge bug fix code. 2015-05-07 16:52:37 +08:00
Vincent Yang 45e4a2029f Merge branch 'v3_addClearforCamera' of https://github.com/dabingnn/cocos2d-x into v3_addClearforCamera 2015-05-07 16:23:44 +08:00
Vincent Yang a8f0ad9d68 Add Scene3DTest. 2015-05-07 16:22:30 +08:00
samuele3hu 23e4e0d4e3 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_remove_vs2012 2015-05-07 16:21:03 +08:00
samuele3hu 0d53065476 issue 10411:Bug in Physics manual Lua binding 2015-05-07 16:15:24 +08:00
minggo 775236b531 Merge pull request #11729 from samuele3hu/v3_7_js
Update the configure of js-tests and js-template on the win32 platform
2015-05-07 15:48:35 +08:00
Huabing.Xu 67ec758d15 add clear feature when before draw scene with a camera 2015-05-07 15:09:06 +08:00
minggo 65ec7f9545 Merge pull request #11728 from WenhaiLin/v3-label-pos
Label: Fixed position is wrong if label content is changed after invoking `getLetter(letterIndex)`
2015-05-07 13:42:28 +08:00