minggo
|
e700ef6d30
|
Merge pull request #11856 from WenhaiLin/v3-support-android-studio
Add Android Studio support
|
2015-05-18 16:17:24 +08:00 |
WenhaiLin
|
26f094b1a7
|
Remove unnecessary files
|
2015-05-18 16:02:05 +08:00 |
WenhaiLin
|
54b6260dfd
|
Rename module
|
2015-05-18 15:17:05 +08:00 |
WenhaiLin
|
6dd3108e42
|
Rename module
|
2015-05-18 15:01:20 +08:00 |
joshuastray
|
06846b5b1a
|
added some missing tests
|
2015-05-18 14:44:33 +08:00 |
WenhaiLin
|
68188f7424
|
Add native code for AS project.
|
2015-05-18 13:41:58 +08:00 |
minggo
|
ff3d28e6d7
|
Merge pull request #11870 from joshuastray/matierial
add material system tests for js
|
2015-05-18 13:33:30 +08:00 |
minggo
|
8068a2c220
|
Merge pull request #11836 from dabingnn/v3_CameraMaskFor2DAnd3DRendering
V3 camera mask for2 d and3 d rendering
|
2015-05-18 13:32:26 +08:00 |
joshuastray
|
00dd854578
|
add material system tests for js
|
2015-05-18 10:44:15 +08:00 |
WenhaiLin
|
7caa6bb2fc
|
Update Copyright.
|
2015-05-18 09:59:50 +08:00 |
minggo
|
2dbe375380
|
Merge pull request #11868 from joshuastray/bullet-preprocessor-macro
add CC_ENABLE_BULLET_INTEGRATION=1 to js project
|
2015-05-18 09:33:00 +08:00 |
minggo
|
d9107f8830
|
Merge pull request #11858 from samuele3hu/v3_updateccs
Update CocoStudioUIEditorTest for Lua to shorten csb file name and replace some deprecated functions.
|
2015-05-18 09:32:06 +08:00 |
joshuastray
|
ead74ac89e
|
add CC_ENABLE_BULLET_INTEGRATION=1 to js project
|
2015-05-17 23:11:17 +08:00 |
samuele3hu
|
562c711cda
|
Update CocoStudioUIEditorTest for Lua and replace some deprecated functions.
|
2015-05-15 18:26:21 +08:00 |
minggo
|
e99b99cc79
|
Merge pull request #11853 from joshuastray/fix-resource-path
fix resource path for js-tests
|
2015-05-15 16:53:47 +08:00 |
WenhaiLin
|
dc8492948e
|
Add Android Studio support
|
2015-05-15 16:37:43 +08:00 |
joshuastray
|
4d0ada1cac
|
fix resource path for js-tests
|
2015-05-15 16:23:43 +08:00 |
minggo
|
8f7a023233
|
Merge pull request #11848 from VisualSJ/v3-build
Add VideoPlayer and webview tests
|
2015-05-15 16:19:56 +08:00 |
VisualSJ
|
376a3f2866
|
[ci skip]Fix naming errors
|
2015-05-15 15:45:37 +08:00 |
VisualSJ
|
01203a8b1b
|
Increase the VideoPlayer and webview tests
|
2015-05-15 15:31:03 +08:00 |
Huabing.Xu
|
c994f28914
|
Merge branch 'v3' into v3_CameraMaskFor2DAnd3DRendering
|
2015-05-15 09:55:51 +08:00 |
minggo
|
973d169cd5
|
Merge pull request #11841 from xiaofeng11/v3
shorten csb file name in ccs-res
|
2015-05-15 09:33:31 +08:00 |
Ricardo Quesada
|
989848a358
|
fixes memory leak
improves performance a little bit
|
2015-05-14 17:24:27 -07: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 |
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
|
0a3e6338f1
|
Merge pull request #11834 from pandamicro/v3_origin
Sync fixes in Cocos2d-JS
|
2015-05-14 13:38:18 +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 |
yangxiao
|
e659373648
|
add getTriangleList to bundle
|
2015-05-14 10:30:20 +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 |
Ricardo Quesada
|
fde5f8d63c
|
Adds better sample
adds clone support as well
|
2015-05-13 17:39:39 -07:00 |
Ricardo Quesada
|
e95de4de62
|
fixes mipmap issue with parsing Sampler
|
2015-05-13 10:24:32 -07:00 |
Jacky
|
c7acb9b83d
|
fix memory leakage.
|
2015-05-13 17:21:57 +08:00 |
yangxiao
|
ec69a34c51
|
add issue9767 test
|
2015-05-13 16:16:45 +08:00 |
Ricardo Quesada
|
f23b15c6d3
|
Merge pull request #11810 from ricardoquesada/api_fixes
More material samples
|
2015-05-12 23:03:40 -07:00 |
minggo
|
50aa8dba47
|
Merge pull request #11806 from MSOpenTech/v3-winrt-ad-fix
V3: updates to app.xaml code to correctly support touches on Microsoft Ads
|
2015-05-13 13:39:29 +08:00 |
Ricardo Quesada
|
c693573d77
|
more samples
and API fixes
|
2015-05-12 22:24:52 -07:00 |
Ricardo Quesada
|
a83c10fdbf
|
Merge pull request #11807 from ricardoquesada/material_vertexattrib
Adds support of VertexAttribBinding per Pass
|
2015-05-12 21:05:02 -07:00 |
Ricardo Quesada
|
d23ff0ea2c
|
Adds support of VertexAttribBinding per Pass
|
2015-05-12 19:58:09 -07:00 |
Dale Stammen
|
40c19b31c8
|
updates to app.xaml code to correctly support touches on Microsoft AdControls for WP8.1
|
2015-05-12 19:39:40 -07:00 |
minggo
|
a587b28e38
|
Merge pull request #11792 from super626/v3
particle3d can not be seen when added to scene with terrain
|
2015-05-13 09:38:21 +08:00 |
minggo
|
9a479b59f8
|
Merge pull request #11800 from WenhaiLin/v3-pt-sprite
Fix the performance test of sprite
|
2015-05-13 09:37:27 +08:00 |
minggo
|
5e87bd307b
|
Merge pull request #11798 from WenhaiLin/v3-support-vs2015
Add support for visual studio 2015.
|
2015-05-13 09:37:12 +08:00 |
pandamicro
|
3190d0e5fb
|
Add localStorage.clear test case
|
2015-05-12 19:02:22 +08:00 |
Wenhai Lin
|
7af99d1991
|
Fix the performance test of sprite
|
2015-05-12 17:59:22 +08:00 |
WenhaiLin
|
c70bac7bb4
|
Add support for visual studio 2015.
|
2015-05-12 16:26:28 +08:00 |