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 |
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
|
0106c1184e
|
add pu for performance test
|
2015-03-19 15:00:07 +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 |
yangxiao
|
e6770909f2
|
reset expolosion
|
2015-03-17 17:47:53 +08:00 |
yangxiao
|
dced8004e1
|
reset explosion and fix bug of event handler
|
2015-03-17 17:44:52 +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
|
67fef0eb5e
|
Merge pull request #10856 from super626/v3
modify dds to png
|
2015-03-13 17:00:26 +08:00 |
XiaoYang
|
824a876afd
|
Merge pull request #254 from songchengjiang/v3
replace mp_fire_02_2x2.dds with mp_fire_02_2x2.png
|
2015-03-13 16:39:37 +08:00 |
songchengjiang
|
7e5af41817
|
replace mp_fire_02_2x2.dds with mp_fire_02_2x2.png
|
2015-03-13 16:34:21 +08: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 |
yangxiao
|
81bf776d09
|
do not use MoveTo::reserse
|
2015-03-13 14:10:51 +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 |
Dale Stammen
|
afd0fbab10
|
added missing /bigobj to c++ compiler command line options
|
2015-03-09 10:16:42 -07:00 |
Dale Stammen
|
35222a8193
|
Merge branch 'v3' into v3-wp8-fix
|
2015-03-09 09:20:25 -07:00 |
Dale Stammen
|
a828f73ccb
|
updated expiration date of project certificates
|
2015-03-09 08:31:06 -07:00 |
minggo
|
b8b1c9d018
|
Merge pull request #9708 from minggo/use-console
use cocos console in build_native.py and android-build.py
|
2015-03-09 16:41:56 +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
|
573fdafbd8
|
android work
|
2015-03-04 14:25:46 +08:00 |
andyque
|
942ceccd99
|
fix android and win32 compile error
|
2015-03-04 14:12:11 +08:00 |
yangxiao
|
6a6877b39f
|
add particle to lua test
|
2015-03-04 12:59:22 +08:00 |
yangxiao
|
ea7dfe1147
|
lua test
|
2015-03-04 10:42:08 +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
|
36723fcb68
|
reset submodule
|
2015-03-03 18:34:51 +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
|
d5bde9e536
|
add missing material
|
2015-02-28 12:57:15 +08:00 |
yangxiao
|
218de84cc5
|
remove expolosion particle
|
2015-02-28 11:31:15 +08:00 |
Dale Stammen
|
fb25ce9d1b
|
disabled LTCG to speed up release builds
|
2015-02-27 11:10:33 -08:00 |
Dale Stammen
|
f68a966485
|
disabled Check SDL to allow CC_DEPRECATED to work as warning and not error
|
2015-02-27 11:07:51 -08:00 |
Dale Stammen
|
b5e936c657
|
disabled LTCG to speed up release builds
|
2015-02-27 10:43:13 -08:00 |
Dale Stammen
|
5e6865ce53
|
added missing CC_PLATFORM_WINRT
|
2015-02-27 10:38:18 -08:00 |
Dale Stammen
|
2eb919bb7a
|
disabled Check SDL to allow CC_DEPRECATED to work as warning and not error
|
2015-02-27 10:36:48 -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
|
6f395edf0e
|
modify according to minggo
|
2015-02-26 17:37:45 +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 |
Nite Luo
|
dbba9e36a1
|
Merge pull request #10431 from vovkasm/dev/fix-win32-resource-search-path
Fix win32 resource search path to be relative to the executable.
|
2015-02-25 20:24:07 -08:00 |
Ray
|
0f8f0322c8
|
fix ccs-res
|
2015-02-26 10:10:32 +08: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
|
71f90306f7
|
update ccs-res submodule
|
2015-02-25 15:40:46 +08:00 |
Ray
|
94523b667a
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
|
2015-02-25 14:19:37 +08:00 |
Ray
|
c66a4f28bc
|
Add CocosStudio UserCameraReader
fix Sprite3DReader Test
|
2015-02-25 14:19:08 +08:00 |
minggo
|
2f618a9e09
|
Merge pull request #10541 from lzbgt/master
fix the linker ld error when building
|
2015-02-25 11:00:49 +08:00 |
Ray
|
bd64321e30
|
fix commit
|
2015-02-23 23:57:41 +08:00 |
Ray
|
c5cc1ebaa2
|
fix test project
|
2015-02-23 16:35:46 +08:00 |
Ray
|
35e3e8d62d
|
Sprite3D Reader and tests
|
2015-02-23 00:34:30 +08:00 |
Bruce
|
95ba69c868
|
fix ld error when building
|
2015-02-22 00:08:27 +08:00 |
Bruce
|
9c2ecafeb4
|
fix ld error when building
|
2015-02-21 23:56:05 +08:00 |
Bruce
|
871489ec2d
|
fix ld error when building
|
2015-02-21 22:55:35 +08:00 |
Krishna Narasimhan
|
36be1ec24b
|
Source refactor. Abstracted common functionalities from 4 onTouches methods in Camera3dTest
|
2015-02-21 11:39:26 +01:00 |
Ray
|
80a5b201f8
|
3DNode Reader lua Test
|
2015-02-19 17:28:51 +08:00 |
Ray
|
73e40f1c4b
|
Node3DReader Test
|
2015-02-19 16:18:54 +08:00 |
Dale Stammen
|
76233d4c6e
|
added missing Particle3D files and tests
|
2015-02-16 10:41:03 -08:00 |
Dale Stammen
|
795f65c85f
|
added missing Particle3D files and tests
|
2015-02-16 10:01:09 -08:00 |
XiaoYang
|
9e7b22f35c
|
Merge pull request #239 from samuele3hu/particle_merge
Fix the search path error
|
2015-02-15 18:38:16 +08:00 |
samuele3hu
|
9be620043f
|
Fix the search path error
|
2015-02-15 18:29:10 +08:00 |
yangxiao
|
10a8613b36
|
android properties to 10
|
2015-02-15 17:22:39 +08:00 |
samuele3hu
|
3a7cbe9d67
|
Add Particle3DTest for Lua and update related configure files
|
2015-02-15 15:56:20 +08:00 |
yangxiao
|
a9384a3250
|
add particle3dtest
|
2015-02-15 13:26:29 +08:00 |
minggo
|
d2836a62af
|
revert submodule
|
2015-02-13 18:06:14 +08:00 |
minggo
|
058668711b
|
fix conflict
|
2015-02-13 16:44:14 +08:00 |
yangxiao
|
51ae806700
|
remove unused code
|
2015-02-13 16:19:38 +08:00 |
yangxiao
|
9b117bf87c
|
resolve conflict
|
2015-02-13 15:46:19 +08:00 |
kompjoefriek
|
a2ef1abef3
|
Fixed unwanted changes
|
2015-02-12 23:07:24 +01:00 |