WenhaiLin
1839564fbb
Merge branch 'v3-dev-get-suitable-f-open' of https://github.com/perminovVS/cocos2d-x into v3.7
2015-05-04 10:16:47 +08:00
minggo
4acd231f89
merge v3.6
2015-04-30 13:46:08 +08:00
minggo
98fcd83d50
Merge pull request #10870 from daiki1003/fix/scroll_view_container
...
Fix container view's anchor point problem.
2015-04-27 11:44:19 +08:00
minggo
0198c8707b
Merge pull request #11572 from super626/v3
...
Fix memory leak
2015-04-24 16:42:33 +08:00
songchengjiang
2aee4abd66
fix https://github.com/cocos2d/cocos2d-x/issues/11203
...
fix the error of CCBundle3D
2015-04-24 15:31:50 +08:00
pandamicro
ec41965add
Add get header and callback for Downloader
2015-04-23 19:07:07 +08:00
Vladimir Perminov
6ef1e7e3d0
Optimize Vec3 use constructor default.
...
Make Vec3 vec3(Vec3::ZERO); to Vec3 vec3;
2015-04-20 12:56:43 +03:00
Vladimir Perminov
4c33050536
Optimize Vec2
...
small function Vec2 move to Vec2.inl
Added:
setZero();
Change all code:
_vec2 = Vec2(x, y); -> _vec2.set(x, y);
Vec2 vec2 = Vec2(x, y); -> Vec2 vec2(x, y);
_vec2 += Vec2(x, y); -> _vec2.add(x, y);
_vec2 = Vec2::ZERO; -> _vec2.setZero();
Vec2 vec2(Vec2::ZERO); -> Vec2 vec2;
2015-04-19 20:40:52 +03:00
Vladimir Perminov
694b9adc1e
Add FileUtils::getSuitableFOpen
...
win32 fopen only ansi encoding.
if filePath contains utf8 characters fopen fail.
AudioCache FileFormat::OGG bag, can't open file, if filePath contains
utf8.
Need make all filename for fopen correct encoding.
Only Win32 FileUtils::getSuitableFOpen return
StringUtf8ToAnsi(filename),
other platform return filename
all fopen use FileUtils::getSuitableFOpen
2015-04-19 14:00:27 +03:00
songchengjiang
f8f18cc026
enable users to clone PUParticleSystem3D
2015-04-15 12:44:03 +08:00
songchengjiang
ed407e7889
fix the bug of makeParticleLocal function
2015-04-10 17:32:13 +08:00
songchengjiang
783b159abc
naming error
2015-04-10 16:09:39 +08:00
songchengjiang
6b8d8a4774
fix the bug of PUParticle3DQuadRender
2015-04-10 15:58:16 +08:00
songchengjiang
a6e83ca35b
fix the bug of makeParticleLocal function
2015-04-10 11:31:39 +08:00
songchengjiang
98211a8c3f
fix the bug of PURibbonTrail
2015-04-09 16:49:03 +08:00
minggo
353c2b0d75
Merge pull request #11288 from perminovVS/v3-dev-optimize-vec3
...
Optimize Vec3
2015-04-07 14:04:57 +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
Vladimir Perminov
105bac2d55
Optimize Vec3
...
small function Vec3 move to Vec3.inl
Added:
add(float xx, float yy, float zz);
setZero();
Change all code:
_vec3 = Vec3(x, y, z); -> _vec3.set(x, y, z);
Vec3 vec3 = Vec3(x, y, z); -> Vec3 vec3(x, y, z);
_vec3 += Vec3(x, y, z); -> _vec3.add(x, y, z);
_vec3 = Vec3::ZERO; -> _vec3.setZero();
2015-04-05 13:09:50 +03:00
Daiki Asahi
b9d294f542
Fix container view's anchor point problem.
2015-04-03 16:37:48 +09:00
songchengjiang
e4a58d5c35
fix the bug of Particle3DModelRender
2015-04-03 12:43:14 +08:00
samuele3hu
c3ad458a26
Update comment for Lua
2015-03-30 15:47:47 +08:00
andyque
42cd63fe01
fix group error
2015-03-26 15:47:14 +08:00
minggo
1e271a9d96
Merge pull request #10899 from super626/v3
...
Bug fix
2015-03-17 19:29:21 +08:00
songchengjiang
a9e5f8cc4a
replace static_cast with dynamic_cast
2015-03-17 17:47:58 +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
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
yangxiao
1e240e92f9
empty mesh check
2015-03-10 13:31:04 +08:00
songchengjiang
e30c473f85
fix the bug of material reading on linux
2015-03-09 17:30:28 +08:00
yangxiao
578053d351
add macro on other platform
2015-03-06 18:03:11 +08:00
XiaoYang
27ae60e626
Merge pull request #249 from songchengjiang/particle_merge
...
support win8.1
2015-03-06 17:57:34 +08:00
songchengjiang
4ca90341b9
support win8.1
2015-03-06 15:35:02 +08:00
yangxiao
bac5377e8c
format
2015-03-06 10:44:56 +08:00
yangxiao
bec346bf73
add comments
2015-03-06 10:35:42 +08:00
songchengjiang
444dbfdf9e
replace .mesh with .c3b
...
modify ParticleUniverse file structure
2015-03-05 14:54:32 +08:00
yangxiao
70c25ecded
modify project using short path
2015-03-05 13:40:52 +08:00
yangxiao
4de96cf1e6
modify pu path
2015-03-05 13:28:42 +08:00
yangxiao
faf299c5a1
make path shorter
2015-03-05 13:24:06 +08:00
songchengjiang
590912ba49
Merge branch 'particle_merge' of https://github.com/super626/cocos2d-x into particle_merge
2015-03-04 15:29:05 +08:00
songchengjiang
4783ac4f86
remove setParticleSystemScaleVelocity
2015-03-04 15:18:03 +08:00
yangxiao
9665bb6dd8
add to linux project
2015-03-04 15:17:37 +08:00
songchengjiang
d861220993
restore model search path
2015-03-04 14:56:04 +08:00
songchengjiang
7c1e8e1a08
Merge branch 'particle_merge' of https://github.com/super626/cocos2d-x into particle_merge
...
Conflicts:
tests/cpp-tests/Classes/Particle3DTest/Particle3DTest.cpp
2015-03-04 14:12:34 +08:00
songchengjiang
1b0fc162b0
fix bugs
2015-03-04 13:19:42 +08:00
yangxiao
e466b5d231
fix warning
2015-03-04 10:24:07 +08:00
yangxiao
a92a8ac924
particle to transparent queue
2015-03-04 10:10:33 +08:00
yangxiao
68eaadaffb
merge cocos
2015-03-04 09:57:42 +08:00
XiaoYang
8092437463
Merge pull request #245 from songchengjiang/particle_merge
...
add test demo
2015-03-03 17:46:47 +08:00
yangxiao
18a3a23a2e
adjust code style
2015-03-03 15:57:03 +08:00
yangxiao
db5c098ca8
adjust
2015-03-03 15:13:47 +08:00