minggo
|
3a223f0732
|
Merge pull request #11843 from CocosRobot/update_cocosfiles_1431599536
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-14 18:38:04 +08:00 |
CocosRobot
|
4240632c68
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-14 10:32:18 +00:00 |
minggo
|
c6a2c8f56a
|
Merge pull request #11840 from natural-law/v3
Update the reference of submodule cocos2d-console.
|
2015-05-14 18:29:10 +08:00 |
Huabing.Xu
|
66a97901d2
|
revert submodule commit
|
2015-05-14 18:18:35 +08:00 |
xiaofeng11
|
f15f8e8e6a
|
Merge pull request #22 from doomsdayer/v3
changed csb names in ccs-res to shorter
|
2015-05-14 18:17:12 +08:00 |
minggo
|
9f3284d62f
|
Merge pull request #11833 from super626/v3
getTriangleList to bundle and add terrain to 3d render queue
|
2015-05-14 18:16:27 +08:00 |
yusheng.lu
|
60190a1be6
|
changed csb names in ccs-res to shorter
|
2015-05-14 18:08:37 +08:00 |
Bin Zhang
|
65ef7cea88
|
Update the reference of submodule cocos2d-console.
|
2015-05-14 18:00:47 +08:00 |
Vincent Yang
|
efc3f7cb73
|
Add Scene3DTest source to cpp-tests win32/win8 project.
|
2015-05-14 15:19:39 +08:00 |
Huabing.Xu
|
9963480abd
|
linux works
|
2015-05-14 14:49:48 +08:00 |
Huabing.Xu
|
8bdb8125a2
|
fix android compile error
|
2015-05-14 14:36:45 +08:00 |
minggo
|
4b82cd7052
|
Merge pull request #11837 from yinjimmy/simulator
simulator
|
2015-05-14 14:25:30 +08:00 |
yinjimmy
|
5cfa5ad8b8
|
add simulator
|
2015-05-14 14:11:40 +08:00 |
yinjimmy
|
d78d8b2c1f
|
move menu bar to system menu
|
2015-05-14 13:43:17 +08:00 |
minggo
|
975db5e22d
|
Merge pull request #11828 from joshuastray/add-bullet-to-template
add libbullet to js template
|
2015-05-14 13:38:58 +08:00 |
minggo
|
0a3e6338f1
|
Merge pull request #11834 from pandamicro/v3_origin
Sync fixes in Cocos2d-JS
|
2015-05-14 13:38:18 +08:00 |
minggo
|
db9c4e65b9
|
Merge pull request #11832 from CocosRobot/update_lua_bindings_1431570311
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-14 13:37:08 +08:00 |
Huabing.Xu
|
84540c1ff4
|
Merge branch 'v3' into v3_CameraMaskFor2DAnd3DRendering
Conflicts:
cocos/renderer/CCGLProgramCache.cpp
tests/cpp-tests/Classes/controller.cpp
|
2015-05-14 11:55:10 +08:00 |
yangxiao
|
5b8b4fed50
|
multiply scale before construct physics
|
2015-05-14 10:44:08 +08:00 |
pandamicro
|
4146a6edf4
|
Fix incorrect property of cc.Texture2D
|
2015-05-14 10:41:10 +08:00 |
pandamicro
|
2685df73f2
|
Fix spine crash issue
|
2015-05-14 10:40:37 +08:00 |
pandamicro
|
8577055d5a
|
Implement localStorage.clear on Android
|
2015-05-14 10:40:25 +08:00 |
CocosRobot
|
006f9fcd36
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-14 02:30:32 +00:00 |
yangxiao
|
e659373648
|
add getTriangleList to bundle
|
2015-05-14 10:30:20 +08:00 |
yangxiao
|
0f0f85b33c
|
terrain to 3d render queue
|
2015-05-14 10:29:50 +08:00 |
minggo
|
cbab1074fa
|
Merge pull request #11819 from cpascal/fix_defined
Fix compile error: using any of CC_USE_JPEG=0, CC_USE_PNG=0, CC_USE_TIFF=0, CC_USE_WIC=0
|
2015-05-14 10:21:38 +08:00 |
minggo
|
f090c12030
|
[ci skip]update CHANGELOG
|
2015-05-14 10:21:11 +08:00 |
minggo
|
7732cd6e77
|
Merge pull request #11814 from super626/issue9767
add issue9767 test
|
2015-05-14 10:20:09 +08:00 |
minggo
|
3b60f67041
|
Merge pull request #11816 from fusijie/fix_spritepolygon
fix memory leakage.
|
2015-05-14 10:19:48 +08:00 |
minggo
|
1eaacd27c5
|
Merge pull request #11818 from joshuastray/fix-js-compilation
fix script binding code generation
|
2015-05-14 10:19:27 +08:00 |
joshuastray
|
59c0a64d38
|
add libbullet to js template
|
2015-05-14 10:01:22 +08:00 |
Ricardo Quesada
|
9003eae9e2
|
Merge pull request #11827 from ricardoquesada/material_sample
Adds better sample
|
2015-05-13 18:19:31 -07:00 |
Ricardo Quesada
|
fde5f8d63c
|
Adds better sample
adds clone support as well
|
2015-05-13 17:39:39 -07:00 |
Ricardo Quesada
|
e2cef9a3a7
|
Merge pull request #11826 from ricardoquesada/renderstate_parsing
RenderState can be part of Material and Technique
|
2015-05-13 14:57:51 -07:00 |
Ricardo Quesada
|
aeea7ade14
|
RenderState can be part of Material and Technique
|
2015-05-13 14:12:37 -07:00 |
Ricardo Quesada
|
7bf550f38b
|
Merge pull request #11825 from ricardoquesada/material_fixes
fixes mipmap issue with parsing Sampler
|
2015-05-13 12:13:02 -07:00 |
Ricardo Quesada
|
e95de4de62
|
fixes mipmap issue with parsing Sampler
|
2015-05-13 10:24:32 -07:00 |
dkorchinskiy
|
9d7e5e5edc
|
Fix crash in web view if illegal character in url (Android only)
|
2015-05-13 14:56:07 +03:00 |
cpascal
|
134355d763
|
Fix compile error: using any of CC_USE_JPEG=0, CC_USE_PNG=0, CC_USE_TIFF=0, CC_USE_WIC=0
When I don't want to use TIF file,
Cocos2d-x ccConfig.h's style is..
#define CC_USE_TIF 0
But CCImage.cpp just check wheather defined or not..
|
2015-05-13 20:52:32 +09:00 |
cpascal
|
7e9019f9d6
|
Revert "Fixed ogg filepath has unicode in Win32"
This reverts commit 382fd48b6a .
|
2015-05-13 20:49:46 +09:00 |
joshuastray
|
4699b0cfb5
|
fix script binding code generation
|
2015-05-13 17:51:30 +08:00 |
cpascal
|
14f8b02d9b
|
Merge remote-tracking branch 'upstream/v3' into v3
|
2015-05-13 18:28:38 +09:00 |
Jacky
|
c7acb9b83d
|
fix memory leakage.
|
2015-05-13 17:21:57 +08:00 |
minggo
|
1007c0bfdb
|
Merge pull request #11813 from CocosRobot/update_lua_bindings_1431504407
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-13 17:05:27 +08:00 |
minggo
|
43fb8d842b
|
[ci skip]update AUTHORS
|
2015-05-13 17:04:55 +08:00 |
minggo
|
9e02b230c7
|
[ci skip]update CHANGELOG
|
2015-05-13 17:03:37 +08:00 |
minggo
|
3d0c7705f7
|
Merge pull request #11763 from Dimon4eg/v3
Fix web view leak on iOS
|
2015-05-13 17:02:50 +08:00 |
yangxiao
|
ec69a34c51
|
add issue9767 test
|
2015-05-13 16:16:45 +08:00 |
CocosRobot
|
6bf984f3d3
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-13 08:11:34 +00:00 |
minggo
|
a7317ee387
|
Merge pull request #11811 from natural-law/v3
Update the reference of submodule cocos2d-console.
|
2015-05-13 16:02:47 +08:00 |