samuele3hu
|
fd554c07da
|
Rename the file names
|
2015-04-07 09:31:04 +08:00 |
samuele3hu
|
a64e90d469
|
Update the related project setting for Luajit and related test cases
|
2015-04-06 22:41:34 +08:00 |
minggo
|
eefd06415b
|
Merge pull request #11229 from xiaofeng11/v3
Add destroyCocosStudio()
|
2015-04-01 10:49:49 +08:00 |
pipu
|
bc7d8f0a09
|
Add method destroyCocosStudio() for CocoStudio
|
2015-03-31 19:55:56 +08:00 |
minggo
|
c1cd041912
|
Merge pull request #11221 from super626/v3
3d animation quality control
|
2015-03-31 17:23:58 +08:00 |
pipu
|
a0a461f319
|
Supplement some Reader.
|
2015-03-31 11:22:34 +08:00 |
yangxiao
|
4e03c62b03
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2015-03-31 11:09:59 +08:00 |
yangxiao
|
a6c1d15120
|
fix warning
|
2015-03-31 11:09:38 +08:00 |
lvlong
|
4bc44c207d
|
modify config-example.plist
|
2015-03-30 18:07:32 +08:00 |
lvlong
|
cbdfd77400
|
modify some name.
|
2015-03-30 17:46:45 +08:00 |
lvlong
|
f967fef7d0
|
modify Sprite3DWithSkinTest, can switch animation quality.
|
2015-03-30 17:08:49 +08:00 |
lvlong
|
ccb5039411
|
Merge branch 'v3' of github.com:super626/cocos2d-x into v3
Conflicts:
cocos/base/CCConfiguration.h
|
2015-03-30 11:50:01 +08:00 |
minggo
|
d437ce3e59
|
Merge pull request #11208 from samuele3hu/v3_5_comment
Update Sprite3DCubeMap lua test case and the related bindings-generator submodule
|
2015-03-30 10:48:36 +08:00 |
minggo
|
59441adc2c
|
Merge pull request #11213 from super626/texturecube
Texturecube bug fix
|
2015-03-30 10:48:10 +08:00 |
samuele3hu
|
921981833e
|
Update Sprite3DCubeMap test case
|
2015-03-28 14:59:47 +08:00 |
XiaoYang
|
dbf86e3e66
|
Merge pull request #270 from zhukaixy/patch-2
Bugfix: for glcontext recreated
|
2015-03-27 17:08:51 +08:00 |
zhukaixy
|
8a1637e3de
|
Update cube_map.frag
|
2015-03-27 16:50:59 +08:00 |
yangxiao
|
a45f0d1a76
|
merge cocos
|
2015-03-27 16:50:40 +08:00 |
zhukaixy
|
a5bda44f22
|
Update Sprite3DTest.cpp
|
2015-03-27 16:47:48 +08:00 |
yangxiao
|
c23746fbcd
|
modify
|
2015-03-26 13:05:42 +08:00 |
yangxiao
|
7af9957e1c
|
reset submodule
|
2015-03-26 12:56:38 +08:00 |
yangxiao
|
000e34c6d0
|
merge cocos
|
2015-03-26 12:50:18 +08:00 |
yangxiao
|
84535feb0c
|
merge cocos
|
2015-03-26 11:59:26 +08:00 |
lvlong
|
c999307150
|
add different animate quality.
|
2015-03-26 11:30:22 +08:00 |
yangxiao
|
8d24ea7efe
|
rename to nodeanimation
|
2015-03-26 10:20:28 +08:00 |
yangxiao
|
90e010aec8
|
add light
|
2015-03-26 10:09:12 +08:00 |
zhukaixy
|
572ede87f2
|
correct for code indent
|
2015-03-26 10:05:43 +08:00 |
zhukaixy
|
aead9e5855
|
correct for code indent
|
2015-03-26 09:53:41 +08:00 |
lvlong
|
f93dffdeb0
|
node frame animation test and resource
|
2015-03-26 09:25:37 +08:00 |
lvlong
|
ecfd66cda3
|
node frame code!!!!!
|
2015-03-26 09:12:05 +08:00 |
zhukaixy
|
c1e5e47bdb
|
fix code style issue
|
2015-03-25 13:46:30 +08:00 |
zhukaixy
|
54472497a4
|
fix comments
|
2015-03-25 13:43:55 +08:00 |
zhangbin
|
7aaf122a41
|
Support compile & run test projects with cocos2d-console on wp8.
|
2015-03-25 11:42:55 +08:00 |
zhukaixy
|
2ebc854335
|
Modify code style
|
2015-03-25 11:36:11 +08:00 |
zhukaixy
|
6eaa78d1cb
|
add reload mechanism for TextureCube and Skybox
|
2015-03-24 15:43:59 +08:00 |
minggo
|
7e7cef3556
|
Merge pull request #11066 from super626/v3
Fix android switch back and foreground bug
|
2015-03-23 11:15:17 +08:00 |
XiaoYang
|
fcf6cab884
|
Merge pull request #262 from tangziwen/v3_abc
fix UVAnimation test while switching back to foreground
|
2015-03-23 10:38:11 +08:00 |
tangziwen
|
e213cd1747
|
fix UVAnimation test while switching back to foreground
|
2015-03-23 10:19:00 +08:00 |
zhukaixy
|
52280e6376
|
add 3d test case(skybox and texture cube) for lua project
|
2015-03-20 17:53:05 +08:00 |
pipu
|
0bdfe99731
|
Update resources of Test TestTimelineProjectNode.
|
2015-03-20 17:08:15 +08:00 |
Dale Stammen
|
73e01c0d5e
|
added missing PerformanceParticle3DTest.cpp to WP8 project
|
2015-03-19 05:53:37 -07:00 |
minggo
|
f3e518b103
|
Merge pull request #10985 from dabingnn/v3_fixRenderTextureCrash
fix crash problem when switch to a new scene after call RenderTexture::s...
|
2015-03-19 20:00:31 +08:00 |
minggo
|
1aec5a9508
|
Merge pull request #10980 from super626/v3
3d particle performance test
|
2015-03-19 20:00:07 +08:00 |
yangxiao
|
0d045feec5
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2015-03-19 18:10:41 +08:00 |
yangxiao
|
6c6fffc847
|
modify enum to static int
|
2015-03-19 18:10:16 +08:00 |
Huabing.Xu
|
8b04a15ee8
|
fix crash problem when switch to a new scene after call RenderTexture::saveToFile()
|
2015-03-19 16:39:45 +08:00 |
XiaoYang
|
dfe9e45d50
|
Merge pull request #259 from lvlonggame/camera_culling_crash
fix: Camera culling crash
|
2015-03-19 16:30:00 +08:00 |
tangziwen
|
f60649b39f
|
add particle-perf for win rt
|
2015-03-19 16:09:16 +08:00 |
lvlong
|
9e3ae9bfb5
|
remove get window size.
|
2015-03-19 15:24:58 +08:00 |
zhukaixy
|
0587122ccc
|
Move Skybox.shader from Sprite3DTest to Shader3D folder
|
2015-03-19 15:11:24 +08:00 |