Huabing.Xu
|
727231a888
|
change test cases
|
2015-05-28 17:04:49 +08:00 |
Huabing.Xu
|
471547e0b0
|
refactor FrameBufferObject to FrameBufferObject and RenderTarget
|
2015-05-27 11:40:12 +08:00 |
Huabing.Xu
|
c22a8e81ce
|
Merge branch 'v3' into v3FrameBufferObject
|
2015-05-25 16:56:22 +08:00 |
Huabing.Xu
|
6d9f850e2c
|
use trianglescommand for sprite
|
2015-05-22 15:54:56 +08:00 |
minggo
|
d5d329b74f
|
Merge pull request #11946 from andyque/v3-final-android-9-patch-feature
add Android 9-patch image format support
|
2015-05-22 09:52:12 +08:00 |
minggo
|
1a1860e126
|
Merge pull request #11949 from jianglong0156/modifyTestResource
Modify test resource
|
2015-05-22 09:49:08 +08:00 |
minggo
|
10fb660fca
|
Merge pull request #11947 from dabingnn/v3_bugForCameraVisitingScene
add test case to reproduce the bug for visiting scene by multiple camera
|
2015-05-22 09:47:18 +08:00 |
Dale Stammen
|
7d0ca21167
|
use stringstream instead to to_string
|
2015-05-21 12:39:00 -07:00 |
Dale Stammen
|
8bb393f16f
|
use stringstream instead to to_string
|
2015-05-21 12:20:43 -07:00 |
Dale Stammen
|
52546112a5
|
added tests for saving cocos2d::Data buffers
|
2015-05-21 11:22:37 -07:00 |
jianglong0156
|
9ed290e64e
|
Merge branch 'jsTest' into modifyTestResource
|
2015-05-21 17:35:13 +08:00 |
Huabing.Xu
|
2d147f0b97
|
[ci skip] and an empty line at the end of file
|
2015-05-21 17:12:35 +08:00 |
Huabing.Xu
|
c202cad712
|
add test case to reproduce the bug for visiting scene by multiple camera
|
2015-05-21 16:57:13 +08:00 |
andyque
|
0352a7a3ea
|
add Android 9-patch image format support
commit c214c4a7a457275785d6377031b5a267d543ffbb
Author: andyque <guanghui8827@126.com>
Date: Mon May 18 17:16:09 2015 +0800
Add Android 9-patch format support.
Squashed commit of the following:
commit a5a5a7a8f25b5bddae0ba21c56676a3f8d84102a
Author: andyque <guanghui8827@126.com>
Date: Mon May 18 17:08:05 2015 +0800
finish refactoring
commit 730bf817f833de56999c616779fc0279890e14bf
Author: andyque <guanghui8827@126.com>
Date: Mon May 18 11:47:08 2015 +0800
refactoring 9-patch
commit b45be6d54ac6e70a3fb9aa3eb700b252e4e72a54
Author: andyque <guanghui8827@126.com>
Date: Mon May 18 09:42:06 2015 +0800
refactor
commit 384110193f1d581c4a0fb7a2c771c55f1db63cbf
Author: andyque <guanghui8827@126.com>
Date: Fri May 15 17:59:21 2015 +0800
fix lua and Android compile error
commit 2877538fb3a436f95400b2ad637ea147b9df81d7
Author: andyque <guanghui8827@126.com>
Date: Fri May 15 11:32:43 2015 +0800
Add Android 9-patch image format support.
The 9-patch format is used for creating Scale9Sprite.
|
2015-05-21 16:04:37 +08:00 |
jianglong0156
|
5af04be9ad
|
add js-test resources
|
2015-05-21 15:38:41 +08:00 |
Dale Stammen
|
209e7c62f4
|
added libbullet to Windows 8.1 Universal App projects
|
2015-05-20 08:01:01 -07:00 |
WenhaiLin
|
a569d877ba
|
[ci skip]Remove unnecessary code.
|
2015-05-20 18:05:46 +08:00 |
minggo
|
7024d3129c
|
Merge pull request #11893 from MSOpenTech/v3-winrt-audio
New audio engine support in winrt win8.1-universal
|
2015-05-20 13:40:41 +08:00 |
WenhaiLin
|
df3548673f
|
Remove unnecessary files.
|
2015-05-20 10:19:32 +08:00 |
anniruddh.koppal
|
8432323450
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-winrt-audio
|
2015-05-19 16:01:10 -07:00 |
Ricardo Quesada
|
aa027fbe0f
|
Properties fixes
`createNonRefCounted` instead of `CrateWithoutAutorelease`
`readlines()` code is easier to read. Same performance
|
2015-05-19 13:51:52 -07:00 |
anniruddh.koppal
|
e0b3091dcf
|
Merge branch 'v3' of https://github.com/MSOpenTech/cocos2d-x into v3-winrt-audio
Conflicts:
tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters
|
2015-05-18 19:21:48 -07:00 |
anniruddh.koppal
|
9081304e80
|
reduced audio file sizes
|
2015-05-18 19:00:59 -07:00 |
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 |
Huabing.Xu
|
f96e704f7d
|
Merge branch 'v3' into v3FrameBufferObject
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/cocos2d.h
cocos/renderer/CCGLProgramCache.cpp
|
2015-05-18 13:48:50 +08:00 |
WenhaiLin
|
68188f7424
|
Add native code for AS project.
|
2015-05-18 13:41:58 +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 |
WenhaiLin
|
7caa6bb2fc
|
Update Copyright.
|
2015-05-18 09:59:50 +08:00 |
anniruddh.koppal
|
2db5a89b87
|
Added new audio engine with wav support
|
2015-05-15 18:17:52 -07:00 |
samuele3hu
|
562c711cda
|
Update CocoStudioUIEditorTest for Lua and replace some deprecated functions.
|
2015-05-15 18:26:21 +08:00 |
WenhaiLin
|
dc8492948e
|
Add Android Studio support
|
2015-05-15 16:37:43 +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 |
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 |
Huabing.Xu
|
e6e0a1d15c
|
refactor: FrameBufferObject will contain an Texture2D instead of inheriting from Texture2D
|
2015-05-14 10:36:49 +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 |