pandamicro
|
a666658764
|
Merge pull request #12998 from pandamicro/v3.7.1
Add BoneNode/SkeletonNode/SkinNode JS bindings
|
2015-07-24 23:42:38 +08:00 |
pandamicro
|
05bb775438
|
Sync timelineParser and fix issue
|
2015-07-24 20:16:56 +08:00 |
VisualSj
|
64d247d91b
|
Issue #12997: Add JS test case (ccs.BoneNode)
|
2015-07-24 15:45:19 +08:00 |
geron-cn
|
0b09fd5bcb
|
Merge branch 'v3.7.1' of github.com:cocos2d/cocos2d-x into 3.7.1
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.h
|
2015-07-24 11:38:09 +08:00 |
zhangcheng
|
4b8248c015
|
Optimization of Custom Data.
replace ComExtensionData to ObjectExtensionData.
|
2015-07-23 16:30:23 +08:00 |
geron-cn
|
d46c8c6802
|
add lack file
|
2015-07-23 15:12:09 +08:00 |
geron-cn
|
915cefa208
|
bone node
|
2015-07-23 11:51:49 +08:00 |
Liam
|
99c1c33c61
|
update resource
|
2015-07-22 15:56:35 +08:00 |
WenhaiLin
|
a6f8031af9
|
Label:support font that contains GB2312 char map.[except android]
|
2015-07-16 17:10:05 +08:00 |
pandamicro
|
600568fdba
|
Migrate test case from #10692 @babcca
|
2015-07-12 11:33:22 +08:00 |
XiaoFeng
|
9a6ffd8904
|
Add bug test for PageView layout & CCNodeDraw::onDrawGLLine
|
2015-07-07 09:54:42 +08:00 |
pandamicro
|
ddb982246f
|
Merge pull request #12553 from VisualSJ/v3-aa
Encoded into AVC
|
2015-06-26 10:15:02 +08:00 |
andyque
|
516d45db62
|
update submodule
|
2015-06-25 20:16:43 +08:00 |
VisualSJ
|
110e51d0bc
|
Encoded into AVC
|
2015-06-25 19:01:55 +08:00 |
WenhaiLin
|
45de0b650a
|
[ci skip]Fixed resources.
|
2015-06-19 16:26:03 +08:00 |
pandamicro
|
4fa1cdc302
|
Update submodules
|
2015-06-17 15:43:35 +08:00 |
pandamicro
|
0216d05eee
|
Merge pull request #12102 from super626/navigation2
3D Navigation
|
2015-06-15 13:39:05 +08:00 |
WenhaiLin
|
4d97d5075b
|
Add test case for issue12310.
|
2015-06-12 15:39:57 +08:00 |
yangxiao
|
44c2b0d5ad
|
merge cocos
|
2015-06-11 15:54:42 +08:00 |
Ricardo Quesada
|
453a3d93bc
|
samplers are treated as uniforms
|
2015-06-05 14:55:33 -07:00 |
yangxiao
|
8b5333a5c9
|
Merge branch 'newcode' into navigation2
|
2015-06-04 12:44:39 +08:00 |
Ricardo Quesada
|
6a19661a80
|
Merge pull request #12150 from ricardoquesada/material_custom_uniforms
Material custom uniforms
|
2015-06-03 13:08:04 -07:00 |
Ricardo Quesada
|
ff81078062
|
fixes bug when calculating the dynamic values
|
2015-06-02 17:48:50 -07:00 |
Ricardo Quesada
|
5f6f38616a
|
Merge remote-tracking branch 'cocos2d/v3' into material_custom_uniforms
|
2015-06-02 17:05:05 -07:00 |
Ricardo Quesada
|
87a3a1844a
|
Adds support for Autobindings in Shader
...part of Material
|
2015-06-02 16:56:59 -07:00 |
jianglong0156
|
0c821379f8
|
modify video mp4 formate
|
2015-06-02 17:07:11 +08:00 |
yangxiao
|
3d4606921b
|
merge cocos
|
2015-06-02 14:27:31 +08:00 |
yangxiao
|
c782d63bef
|
add 3d navigation
|
2015-05-29 16:45:33 +08:00 |
子龙山人
|
a968bc2d15
|
Merge pull request #12062 from jianglong0156/jsWebviewTest
Js webview test
|
2015-05-29 11:35:30 +08:00 |
samuele3hu
|
a89e000f80
|
Synchronize the modification of filenames about shaders to fix the bug of MateriaSystemTest .
|
2015-05-28 10:46:44 +08:00 |
Dale Stammen
|
9ee4b4af1e
|
Merge branch 'v3' into v3-winrt-audio
|
2015-05-27 11:54:21 -07:00 |
jianglong0156
|
e105c47cb0
|
improve testcase
|
2015-05-27 18:23:56 +08:00 |
子龙山人
|
c8d8a9cfd2
|
Merge pull request #12022 from jianglong0156/modifyTestResource
Modify test resource
|
2015-05-27 15:05:32 +08:00 |
jianglong0156
|
7820610f13
|
Merge branch 'modifyTestResource' into jsWebviewTest
Conflicts:
cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj
tests/js-tests/project.json
tests/js-tests/src/GUITest/UIWebViewTest/UIWebViewTest.js
tools/tojs/genbindings.py
|
2015-05-26 17:49:17 +08:00 |
jianglong0156
|
4d6b763eb6
|
rename shader file name
|
2015-05-26 17:21:35 +08:00 |
jianglong0156
|
5b7cf14384
|
rename shader file name
|
2015-05-26 17:20:48 +08:00 |
jianglong0156
|
6f67ec1e6c
|
Merge branch '2d-xv3' into modifyTestResource
|
2015-05-26 16:23:25 +08:00 |
jianglong0156
|
fe677f32dd
|
delete js resource
|
2015-05-26 14:28:53 +08:00 |
jianglong0156
|
fd05998b5f
|
fix the bug: shader in jsb can not run correctly.
|
2015-05-25 17:48:34 +08:00 |
jianglong0156
|
82c5fbbc76
|
add js resource for web tests
|
2015-05-25 16:50:27 +08:00 |
anniruddh.koppal
|
b2eb946c14
|
Added MP3 support
|
2015-05-23 19:13:12 -07: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 |
jianglong0156
|
9ed290e64e
|
Merge branch 'jsTest' into modifyTestResource
|
2015-05-21 17:35: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 |
anniruddh.koppal
|
9081304e80
|
reduced audio file sizes
|
2015-05-18 19:00:59 -07:00 |
anniruddh.koppal
|
2db5a89b87
|
Added new audio engine with wav support
|
2015-05-15 18:17:52 -07:00 |
yusheng.lu
|
60190a1be6
|
changed csb names in ccs-res to shorter
|
2015-05-14 18:08:37 +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 |