zhukaixy
|
0587122ccc
|
Move Skybox.shader from Sprite3DTest to Shader3D folder
|
2015-03-19 15:11:24 +08:00 |
zhukaixy
|
f3536056d8
|
Simpilify skybox
|
2015-01-29 19:01:10 +08:00 |
zhukaixy
|
ee99700ec1
|
add test case TextureCube
|
2015-01-29 09:28:14 +08:00 |
geron-cn
|
3268dbc9fd
|
add cpp-test for animation list and projected
|
2015-01-28 02:12:09 +08:00 |
minggo
|
880abfe814
|
Merge pull request #10209 from andyque/fixLoadingBarReloadTexture
Fix loading bar reload texture issue
|
2015-01-27 13:50:38 +08:00 |
andyque
|
691e1925ca
|
udpate test resource submodule
|
2015-01-26 15:05:41 +08:00 |
yangxiao
|
5e1d7449f7
|
complete use case 1
|
2015-01-26 14:58:16 +08:00 |
yusheng.lu
|
304f28a58a
|
Update the csb resources for current Cocos2d-x
|
2015-01-21 17:08:16 +08:00 |
yusheng.lu
|
a35be8977a
|
Submodule ccs-res go forward.
|
2015-01-20 19:18:23 +08:00 |
pipu
|
34402b75c9
|
Merge branch 'v3' into parse_inneractionframe
|
2015-01-12 13:38:30 +08:00 |
pipu
|
82be4701b5
|
Update resource DemoPlayer.csb in path tests/cpp-tests/Resources/ActionTimeline
|
2015-01-12 11:12:38 +08:00 |
songmiao
|
dfa6137ce9
|
modify arcball and fog shader
|
2015-01-07 17:58:10 +08:00 |
songmiao
|
41cd946e27
|
modify fog shader format and notes
|
2015-01-07 15:47:27 +08:00 |
songmiao
|
c522a72f66
|
modify fog shader for ios device
|
2015-01-07 14:56:34 +08:00 |
songmiao
|
d1845f89fe
|
add fog test and arcball camera test
|
2015-01-07 11:47:34 +08:00 |
minggo
|
3c1978fcc3
|
Merge pull request #9611 from super626/quaternion
Rotation With Quaternion
|
2014-12-30 10:09:08 +08:00 |
Thomas Hou
|
cfa9f039ec
|
change light direct for good look.
|
2014-12-29 16:43:48 +08:00 |
andyque
|
13032be21d
|
fix hd png file warning
|
2014-12-27 20:59:37 +08:00 |
andyque
|
9c974eebd0
|
fix libpng warning
|
2014-12-27 20:47:59 +08:00 |
yusheng.lu
|
a781c974de
|
submodule ccs-res go forward to newest
|
2014-12-23 15:35:20 +08:00 |
yusheng.lu
|
58ba057228
|
revert submodule ccs-res
|
2014-12-23 15:27:21 +08:00 |
Liam
|
e4360b7616
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Layout
|
2014-12-23 14:15:55 +08:00 |
yusheng.lu
|
7eedef71e6
|
armature node test completed
|
2014-12-23 11:13:05 +08:00 |
Liam
|
2991b57ec6
|
update lay out reader and samples
|
2014-12-22 18:24:06 +08:00 |
yusheng.lu
|
6de7fae114
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader
|
2014-12-22 18:00:08 +08:00 |
yusheng.lu
|
62c5df2d9d
|
armature node reader done (projs incompleted)
|
2014-12-22 17:35:39 +08:00 |
minggo
|
6195d260c1
|
Merge pull request #9574 from super626/v3
Add new test
|
2014-12-22 15:25:14 +08:00 |
yangxiao
|
7a332aef04
|
ios work
|
2014-12-22 14:17:48 +08:00 |
tangziwen
|
95bcfaaa3e
|
update test 15:29
|
2014-12-19 15:31:06 +08:00 |
tangziwen
|
086bca399f
|
add three samples -- toonshader fakeshadow lightmap
|
2014-12-18 16:09:29 +08:00 |
yusheng.lu
|
c6ba594c72
|
listview resources added
|
2014-12-10 09:59:28 +08:00 |
pipu
|
06a0026632
|
Update ActionTimelineTestScene
|
2014-12-02 16:00:30 +08:00 |
pipu
|
4d0950d828
|
Update submodule that are plugin, ccd-res bindings-generator, cocos2d-console
|
2014-12-02 15:56:32 +08:00 |
tangziwen
|
3381400eec
|
trim uv_test texture's size
|
2014-11-13 12:06:52 +08:00 |
tangziwen
|
85f0b0ec29
|
fix resource miss
|
2014-11-12 17:44:19 +08:00 |
lvlong
|
bdf10426e2
|
new axe.c3b (ver 0.4)
|
2014-10-27 16:12:15 +08:00 |
minggo
|
8a76be13e4
|
Merge pull request #8865 from huangshiwu/v3_fixbug
add two missing image files for TexturePerfermancTest
|
2014-10-20 15:27:12 +08:00 |
huanghsiwu
|
8e6000ef56
|
add two missing image files for TexturePerfermancTest
|
2014-10-20 15:03:30 +08:00 |
Huabing.Xu
|
86fedffd56
|
change asset manager to use a new resource, which will not affect other test cases
|
2014-10-20 11:03:13 +08:00 |
andyque
|
0dc7bbe861
|
fix long file path on WP8
|
2014-10-18 14:48:27 +08:00 |
samuele3hu
|
14f91ea9f6
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
|
2014-10-17 14:38:07 +08:00 |
samuele3hu
|
dfd2077648
|
Update the related manifests files for assetsmanager tests
|
2014-10-17 14:35:52 +08:00 |
andyque
|
e76b605aeb
|
update css submodule
|
2014-10-17 14:22:48 +08:00 |
minggo
|
34cfcb0b54
|
Merge pull request #8690 from dabingnn/v3_spriteLamp
sprite lamp
|
2014-10-16 19:33:57 +08:00 |
Huabing.Xu
|
644aa19b2d
|
Merge branch 'v3' into v3_updateSpine
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2014-10-16 16:48:16 +08:00 |
samuele3hu
|
064e159c70
|
Merge branch 'v3_testMerge' of https://github.com/pandamicro/cocos2d-x into v3_assetsmanager
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/platform/CCFileUtils.cpp
tests/lua-tests/project/CMakeLists.txt
tests/lua-tests/project/Classes/AppDelegate.cpp
tests/lua-tests/project/proj.android/jni/Android.mk
tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj
|
2014-10-15 13:41:27 +08:00 |
Huabing.Xu
|
93158a1cfb
|
update spine runtime and test case
|
2014-10-15 11:23:02 +08:00 |
Huabing.Xu
|
a20b8d671c
|
sprite lamp (works on iOS mac and android)
|
2014-10-14 16:54:52 +08:00 |
minggo
|
0ab3017094
|
Merge pull request #8658 from pipu/v3_pipu
V3 pipu
|
2014-10-14 14:25:46 +08:00 |
pipu
|
86aee1e548
|
Modifying cocos2d_lib.xcodeproj, cocos/Android.mk, cocos/editor-support/cocostudio/Android.mk
|
2014-10-12 15:39:22 +08:00 |