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 |
tangziwen
|
25cd1f4c02
|
update test
|
2015-01-20 10:34:30 +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 |
Huabing.Xu
|
55431d6a83
|
add tile map staggered test
|
2014-10-11 15:09:58 +08:00 |
pipu
|
ee624e47cc
|
1. Modifying UIScale9Sprite
2. Updating UI Test
3. Updatding resource of ActionTimeline
|
2014-10-10 10:44:16 +08:00 |
pandamicro
|
a26e91f839
|
no message
|
2014-10-09 18:30:39 +08:00 |
minggo
|
44aba5b2af
|
Merge pull request #8185 from newnon/v3_Scale9Sprite_improvements
Scale9Sprite improvements
|
2014-09-30 17:09:02 +08:00 |
Sergey Perepelitsa
|
d9204b009e
|
scale9Sprite without scale9enabled scale fix
scale9Sprite crop > border tile bug fix
|
2014-09-30 10:59:20 +04:00 |
Sergey Perepelitsa
|
094716a500
|
Scale9Sprite cropped frames tests
|
2014-09-28 01:58:26 +04:00 |
yangxiao
|
fd35d43510
|
remove unused resource
|
2014-09-26 15:57:18 +08:00 |
yangxiao
|
567c632d98
|
config max support light number in shader
|
2014-09-25 15:29:32 +08:00 |
yangxiao
|
56313aa895
|
merge cocos
|
2014-09-25 11:05:02 +08:00 |
Dhilan007
|
ed4e800d70
|
Add audio resource.
|
2014-09-23 15:38:40 +08:00 |
yangxiao
|
06c0adcf6d
|
remove unused resource
|
2014-09-19 14:52:25 +08:00 |
yangxiao
|
3cfc36591c
|
merge cocos
|
2014-09-11 10:13:57 +08:00 |
yangxiao
|
74f98b36d6
|
merge cocos
|
2014-08-28 09:22:57 +08:00 |
andyque
|
84c5542a0e
|
Merge branch 'v3' into addWebView
|
2014-08-26 22:11:35 +08:00 |
andyque
|
9449152caf
|
finish WebView Tests
|
2014-08-26 22:03:55 +08:00 |
yangxiao
|
03390a4f46
|
merge cocos
|
2014-08-26 14:05:59 +08:00 |
yangxiao
|
dd93439c4b
|
replace model
|
2014-08-25 19:25:51 +08:00 |
songchengjiang
|
00085c157f
|
Added skeleton Model
Light On/Off
|
2014-08-25 16:32:15 +08:00 |
yangxiao
|
2d5431353a
|
engine adjust
|
2014-08-22 13:25:26 +08:00 |
liuliang
|
a27a420a91
|
Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3
Conflicts:
cocos/3d/CCSprite3D.cpp
|
2014-08-20 11:45:48 +08:00 |
songchengjiang
|
d9bf2c2b7e
|
Finished Light And Test
|
2014-08-19 15:51:30 +08:00 |
songchengjiang
|
10afb9b9af
|
Finished Point Light
Finished Directional Light
Finished Spot Light
|
2014-08-18 17:10:07 +08:00 |
Huabing.Xu
|
a9a403013c
|
fix skinned outline effect
|
2014-08-14 10:44:03 +08:00 |
minggo
|
cc37780861
|
Merge pull request #7736 from dabingnn/v3_addSkinnedOutline
V3 add skinned outline
|
2014-08-12 15:07:21 +08:00 |
Huabing.Xu
|
e66d1f6f69
|
add skinned outline effect
|
2014-08-11 18:11:15 +08:00 |
yangxiao
|
3c9483899e
|
camera, cameratest, drawNode3D squash
|
2014-08-07 15:23:31 +08:00 |
yangxiao
|
11a13ce9e2
|
Merge branch 'newcode' into v3
|
2014-08-04 15:41:21 +08:00 |
andyque
|
5af4657fbb
|
fix windows utf8 source code file can not compile erorr
|
2014-08-01 21:20:27 +08:00 |
yangxiao
|
cd379ab412
|
add axe model
|
2014-07-31 11:26:27 +08:00 |
yangxiao
|
da4ba95806
|
SubMesh and Attachment
|
2014-07-29 10:49:06 +08:00 |
Sergey
|
92ac809bfe
|
Mac fonts tests
|
2014-07-24 12:27:17 +04:00 |
geron-cn
|
5b7852c5f6
|
update ccs-res hd csbs
|
2014-07-10 11:17:01 +08:00 |
geron-cn
|
2a64bd8945
|
udpate ccs-res
|
2014-07-09 18:35:10 +08:00 |
geron-cn
|
cd84081c37
|
udpate ccs-res
|
2014-07-09 18:02:17 +08:00 |
lvlong
|
70b9d9b9ac
|
delete cube_anim
|
2014-07-07 17:11:37 +08:00 |
zhangcheng
|
1551854c30
|
revert submodule res-ccs
|
2014-07-02 17:00:30 +08:00 |
Huabing.Xu
|
395e61f977
|
fix outline bug
|
2014-06-30 17:21:04 +08:00 |
yangxiao
|
4685a8654e
|
Animate3D transition
|
2014-06-27 17:02:08 +08:00 |
yangxiao
|
2a6ce26335
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2014-06-27 16:36:36 +08:00 |
yangxiao
|
343ef9ae55
|
update sprite3d test
|
2014-06-27 16:36:01 +08:00 |
lvlong
|
a497cc0ed2
|
wrong suffix name
|
2014-06-27 15:53:25 +08:00 |
lvlong
|
fac17097a0
|
add a new model and change girl model to it
|
2014-06-27 11:44:44 +08:00 |
yangxiao
|
392a769c8f
|
merge cocos2d v3
|
2014-06-26 22:48:42 +08:00 |
yangxiao
|
ccb39e51b2
|
animation3d transition not finished
|
2014-06-26 18:35:12 +08:00 |
lvlong
|
8cc4520deb
|
add boss.c3b
|
2014-06-25 13:22:04 +08:00 |
lvlong
|
658a955e36
|
modify skindata binary reading
|
2014-06-25 13:20:42 +08:00 |
andyque
|
808c4bd763
|
remove unused override method
|
2014-06-23 15:46:07 +08:00 |
lvlong
|
dfd68f128a
|
c3b file
|
2014-06-23 09:03:53 +08:00 |
minggo
|
0d07e19cd1
|
Merge pull request #7054 from 2youyouo2/v3
add TimelineAction
|
2014-06-19 21:05:15 +08:00 |
2youyou2
|
719fdb712d
|
add frame event test
|
2014-06-18 11:22:38 +08:00 |
Huabing.Xu
|
2c8c9dea01
|
use a small texture for sprite3D
|
2014-06-17 22:31:56 +08:00 |
lvlong
|
32cc5b12d6
|
ready
|
2014-06-16 19:30:45 +08:00 |
lvlong
|
4b7f6a6185
|
static Sprite3D is ok
|
2014-06-16 19:08:43 +08:00 |
yangxiao
|
bc31d6b082
|
merge lv
|
2014-06-16 16:45:43 +08:00 |
lvlong
|
920b358764
|
new girl.c3t
|
2014-06-16 16:23:24 +08:00 |
lvlong
|
2282c98f2e
|
do some test
|
2014-06-16 15:38:03 +08:00 |