Ricardo Quesada
|
51374eb822
|
tests compiles on xcode 6.3
no more USING_NS in the header files.
it creates conflict with xcode 6.3
|
2015-04-08 17:37:30 -07:00 |
tangziwen
|
0c2c8b072a
|
terrain update terrain test update ,resource update
|
2015-04-08 15:13:24 +08:00 |
minggo
|
8f52d950de
|
Merge pull request #11309 from WenhaiLin/v3-autotest
Test automation support:Catch crash event on WIN32/MAC/IOS/ANDROID
|
2015-04-08 09:59:13 +08:00 |
andyque
|
9f5932ceeb
|
resolve the chipmunk compile issue
|
2015-04-07 23:20:02 +08:00 |
WenhaiLin
|
6bcddbc779
|
Test automation support:Catch crash event on WIN32/MAC/IOS/ANDROID
|
2015-04-07 16:14:27 +08:00 |
minggo
|
eb928432ce
|
Merge pull request #11302 from WenhaiLin/v3-label-shadowcolor
Label: Fixed shadow color is incorrect.
|
2015-04-07 15:27:19 +08:00 |
minggo
|
b85d26b2f6
|
Merge pull request #11303 from WenhaiLin/v3-autotest
Add missing test
|
2015-04-07 14:28:05 +08:00 |
minggo
|
420ace04e5
|
Merge pull request #11304 from tangziwen/terrain
terrain test update
|
2015-04-07 14:02:01 +08:00 |
tangziwen
|
176f7dd879
|
slightly modified the camera's default position & terrain's Lod distance in the terrain test
|
2015-04-07 11:50:09 +08:00 |
WenhaiLin
|
a6699058a0
|
Add missing test
|
2015-04-07 11:43:02 +08:00 |
WenhaiLin
|
c5c5d3e39d
|
Label: Fixed shadow color is incorrect.
|
2015-04-07 11:17:01 +08:00 |
minggo
|
deaa6a19f0
|
Merge pull request #11257 from super626/terrain
Terrain
|
2015-04-07 09:32:35 +08:00 |
Ricardo Quesada
|
a782eb022d
|
fixes warnings on Xcode 6.3
instead of using `abs()` it uses `std::abs()`
|
2015-04-06 12:08:30 -07:00 |
tangziwen
|
14b94a6aac
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain
Resolve Conflicts:
tests/cpp-tests/Classes/controller.cpp
|
2015-04-03 17:50:08 +08:00 |
tangziwen
|
0193420dfc
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain
Resovle Conflicts:
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
|
2015-04-03 15:45:51 +08:00 |
WenhaiLin
|
0d51c13743
|
Make all test cases work fine with new test framework.
|
2015-04-03 14:31:03 +08:00 |
tangziwen
|
8a7b318c1a
|
Add some helper function to detect the heightMap size,refact Terrain::Create, fix typo ,add doxygen comment
|
2015-04-03 13:49:07 +08:00 |
WenhaiLin
|
6f47006324
|
Add new test framework.
|
2015-04-03 11:54:39 +08:00 |
yangxiao
|
784c68f9a0
|
modify test title
|
2015-04-02 14:18:22 +08:00 |
XiaoYang
|
984babc9c9
|
Merge pull request #281 from tangziwen/terrain
update terrain
|
2015-04-02 10:19:11 +08:00 |
tangziwen
|
6cd1077cb0
|
update terrain
|
2015-04-01 18:24:05 +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 |
XiaoYang
|
45987b6a60
|
Merge pull request #276 from tangziwen/terrain
update Terrain, support skirt
|
2015-03-31 09:14:27 +08:00 |
tangziwen
|
1a93f87a15
|
update terrain
|
2015-03-30 18:25:22 +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 |
minggo
|
59441adc2c
|
Merge pull request #11213 from super626/texturecube
Texturecube bug fix
|
2015-03-30 10:48:10 +08:00 |
yangxiao
|
b469cfa928
|
merge cocos
|
2015-03-30 10:28:14 +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 |
tangziwen
|
3a3e1e9ad1
|
update terrain test
|
2015-03-27 10:47:52 +08:00 |
yangxiao
|
c23746fbcd
|
modify
|
2015-03-26 13:05:42 +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 |
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 |
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 |
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 |
lvlong
|
9e3ae9bfb5
|
remove get window size.
|
2015-03-19 15:24:58 +08:00 |
lvlong
|
9c0b618046
|
Merge branch 'v3' of github.com:super626/cocos2d-x into camera_culling_crash
|
2015-03-19 15:04:18 +08:00 |
lvlong
|
7f18c9809c
|
fix :camera-culling MoveTo
|
2015-03-19 15:02:38 +08:00 |
yangxiao
|
b6a29d80de
|
3d particle performance test
|
2015-03-19 14:43:29 +08:00 |
songchengjiang
|
9329ba1b37
|
add particle3D performance Test
|
2015-03-19 12:32:53 +08:00 |
Martin Konopka
|
2c80b6ae3a
|
Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
|
2015-03-15 00:10:08 +01:00 |
Martin Konopka
|
cd12d08a52
|
Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
|
2015-03-14 19:33:15 +01:00 |
Nite Luo
|
cfa1f0c84f
|
Merge pull request #10843 from konopka/fix_compiler_reorder_warnings
Get rid of compiler warnings: field '_xxx' will be initialized after field '_yyy'...
|
2015-03-13 21:12:35 -07:00 |
Nite Luo
|
3194da4e7d
|
Merge pull request #10720 from darkdukey/hide_cursor
Hide cursor
|
2015-03-13 10:48:15 -07:00 |
Huabing.Xu
|
639ed335b3
|
Merge pull request #10839 from pipu/node_load_callback
To add the function node load callback called during create node from csb file.
|
2015-03-13 15:06:14 +08:00 |
songchengjiang
|
7026b89b02
|
fix the bug of moveTo
|
2015-03-13 11:35:58 +08:00 |
Martin Konopka
|
350b81501d
|
Get rid of warnings: field '_xxx' will be initialized after field '_yyy' [-Wreorder]
Initialization follows the order of declaration, not the order of the initialization list.
|
2015-03-12 23:47:58 +01:00 |
pipu
|
56c3d1c6f6
|
To add the function node load callback called during create node from csb file.
|
2015-03-12 17:36:39 +08:00 |
yangxiao
|
8137b01f23
|
merge cocos
|
2015-03-06 18:31:57 +08:00 |
songchengjiang
|
444dbfdf9e
|
replace .mesh with .c3b
modify ParticleUniverse file structure
|
2015-03-05 14:54:32 +08:00 |
yangxiao
|
faf299c5a1
|
make path shorter
|
2015-03-05 13:24:06 +08:00 |
Nite Luo
|
95bd326829
|
Replace std::to_string
|
2015-03-04 01:42:24 -08:00 |
yangxiao
|
68eaadaffb
|
merge cocos
|
2015-03-04 09:57:42 +08:00 |
Nite Luo
|
e23eeafa4d
|
Create test case for show/hide mouse
|
2015-03-03 14:52:55 -08:00 |
Dale Stammen
|
e93fe1b13b
|
Merge branch 'v3' into v3-wp8-fix
|
2015-03-03 08:40:07 -08:00 |
minggo
|
13e4525772
|
Merge pull request #10659 from super626/v3
Remove expolosion particle
|
2015-03-03 23:03:02 +08:00 |
yangxiao
|
901cfd627b
|
Merge branch 'particle_merge' of https://github.com/super626/cocos2d-x into particle_merge
|
2015-03-03 17:59:25 +08:00 |
songchengjiang
|
d25c025cbe
|
replace star.pu with lineStreak.pu
|
2015-03-03 17:53:19 +08:00 |
yangxiao
|
9e06a4b848
|
Merge branch 'particle_merge' of https://github.com/super626/cocos2d-x into particle_merge
|
2015-03-03 17:47:22 +08:00 |
yangxiao
|
3db3d9ae11
|
merge cocos
|
2015-03-03 17:23:33 +08:00 |
songchengjiang
|
9bdcdec60a
|
add test demo
use particleSystemScaleVelocity
|
2015-03-03 15:10:42 +08:00 |
songchengjiang
|
a9eb4dc7f9
|
support read material files on linux
modify the name of getAliveParticleCnt function
|
2015-03-02 16:28:38 +08:00 |
songchengjiang
|
a71aed6cc8
|
mix particle with sprite3D
|
2015-03-02 13:51:43 +08:00 |
songchengjiang
|
5c460ebb2d
|
add/update particle files
|
2015-03-02 13:07:32 +08:00 |
yangxiao
|
924a3cdff0
|
create particle with pu and material
|
2015-02-28 14:26:33 +08:00 |
yangxiao
|
218de84cc5
|
remove expolosion particle
|
2015-02-28 11:31:15 +08:00 |
Dale Stammen
|
5e6865ce53
|
added missing CC_PLATFORM_WINRT
|
2015-02-27 10:38:18 -08:00 |
minggo
|
b973d08b6e
|
Merge pull request #10608 from super626/v3
Add project function to camera and fix cocos ui bug
|
2015-02-27 11:47:55 +08:00 |
yangxiao
|
437a59fb9a
|
modify project & unproject api
|
2015-02-27 10:01:57 +08:00 |
minggo
|
95a9e7de04
|
Merge pull request #10539 from krishnanm86/knarasimhan_sourcerefactor_branch
Source refactor. Abstracted common functionalities from 4 onTouches meth...
|
2015-02-26 20:35:15 +08:00 |
yangxiao
|
f13237c013
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2015-02-26 17:27:42 +08:00 |
yangxiao
|
9a64eb18dd
|
add project function
|
2015-02-26 15:20:20 +08:00 |
Krishna
|
2018943d6d
|
Removed template argument from ontouchescommon
|
2015-02-26 07:05:44 +01:00 |
Ray
|
83a7b8012c
|
3DParticle Reader and tests
|
2015-02-26 09:19:14 +08:00 |
Krishna
|
75d5e26340
|
Bug Fix. INcluding the required template type for the function declaration
|
2015-02-25 12:19:19 +01:00 |
Krishna
|
2d80518873
|
Introduced function declarators that were missing
|
2015-02-25 10:23:35 +01:00 |
Ray
|
ff07f62e83
|
fix CocosStudio 3DReader test resource
|
2015-02-25 15:49:04 +08:00 |
Ray
|
c66a4f28bc
|
Add CocosStudio UserCameraReader
fix Sprite3DReader Test
|
2015-02-25 14:19:08 +08:00 |