James Chen
c266647447
ParticleSystem should also override `onExit` to unschedule update since in `onEnter`, it will be scheduled again. Otherwise, it'll trigger an assert.
2014-03-28 14:05:38 +08:00
boyu0
cb1c3ccd1a
closed #4573 : Set particle visible to false then set to true cause crashes.
...
Because of the update order, _particleIdx may equal to zero.
2014-03-27 16:47:21 +08:00
minggo
cab21adf4a
Merge pull request #5919 from boyu0/bug4499_ParticleSystem_endRadiusVar_bug
...
closed #4499 : Read ParticleSystem::modeB.endRadiusVar from "minRadiusVariance...
2014-03-25 15:34:36 +08:00
boyu0
759ec61639
closed #4513 : Particle doesn't animate when readd it.
2014-03-24 18:08:55 +08:00
boyu0
5edb9b9f86
closed #4499 : Read ParticleSystem::_endRadiusVar from "minRadiusVariance" in plist.
2014-03-21 16:25:22 +08:00
James Chen
eb8f621ab0
closed #3597 : Uses !xxx.empty() instead of xxx.size() > 0.
2014-01-08 10:47:27 +08:00
James Chen
685b80796b
Merge commit 'refs/pull/4846/head' of git://github.com/cocos2d/cocos2d-x into iss3597-particle-plist
2014-01-08 10:36:51 +08:00
walzer
64af0de648
update copyrights for 2014, in cocos/2d/ folder
2014-01-07 11:25:07 +08:00
Dawid Drozd
b7314cd655
Fix for missing field in particle file.
2014-01-03 21:27:08 +01:00
boyu0
e07c4ffec1
Change NULL to nullptr, edit hungarian notation.
2013-12-18 17:47:20 +08:00
minggo
fa7c97171b
fix some warnings
2013-12-06 16:32:06 +08:00
minggo
b67d567a79
replace long with int or ssize_t
2013-12-05 17:22:22 +08:00
James Chen
c9767b8ea0
issue #2790 : fileToValueDict —> getValueMapFromFile, fileToValueArray —> getValueVectorFromFile.
2013-12-04 17:50:57 +08:00
James Chen
54289276de
issue #2790 : ValueArray —> ValueVector, ValueDict —> ValueMap, IntValueDict —> IntValueMap.
2013-12-04 17:46:57 +08:00
James Chen
2e0489a49c
issue #2790 : Uses ValueDict instead of Dictionary* for ParticleSystem.
2013-12-04 16:02:53 +08:00
James Chen
1164176bed
issue #2790 : NULL —> nullptr in CCParticleSystem.cpp.
2013-12-04 16:02:52 +08:00
Ricardo Quesada
417657b5a9
Merge branch 'develop' into constructors_are_protected
2013-11-15 10:11:49 -08:00
Ricardo Quesada
dd68eb4796
ParticleSystem uses protected constructors
2013-11-14 16:21:49 -08:00
Huabing.Xu
bc55d3246b
Merge branch 'develop' into free_instead_of_delete
...
# By minggo (12) and others
# Via minggo (18) and others
* develop: (78 commits)
[AUTO] : updating submodule reference to latest autogenerated bindings
Update CHANGELOG[ci skip]
Update AUTHORS [ci skip]
fix bug: cccolor to jsval function has error in jsb
[ci skip]
[ci skip]
[ci skip]
[ci skip]
[ci skip]
C++11: NULL -> nullptr
[ci skip]
Fix: UserDefault::createXMLFile with correct XML definition.
[ci skip]
[ci skip]
[ci skip]
Fix bug: rename const with under line seperator
[AUTO] : updating submodule reference to latest autogenerated bindings
Fix bug: Z fighting on TransitionScenePageTurn
Fixed bugs
Modify reader and fixed bugs
...
Conflicts:
cocos/editor-support/cocostudio/CCSGUIReader.cpp
2013-11-14 14:47:01 +08:00
boyu0
fb04c9e574
issue #2770 : fix some warning
2013-11-13 11:22:34 +08:00
Ricardo Quesada
be64dd97cf
replaces `delete[]` with `free()` in C-based API
...
API that returns a newly allocated buffer as an output argument (not return value) are error-prone.
- Users forget to release the newly allocated buffer
- Or the call `delete` instead of `delete[]`
But some of those API need to call `realloc` on the buffer.
But `realloc` is only valid if the buffer was previously allocated with `malloc`.
If a buffer needs to be re-allocated using a C++ API, then `std::vector<char*>` should be used instead...
So, this patch does:
- Migrates the API from `new []` / `delete[]` to `malloc()` / `free()`
- Fixes all the memory issues: incorrect deallocs and memory leaks
- Updates the documentation
- And fixes misc issues with the API: removes `cc` from the ZipUtils class.
2013-11-11 18:09:47 -08:00
Huabing.Xu
99bcca0532
issue #3025 : replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in cocos folder
2013-11-07 19:11:09 +08:00
Ricardo Quesada
555f3609c8
Uses `const std::string&`
...
... instead of const char*
* Because it is more robust
* and it is faster... yes faster.
It is faster because internally some of our classes use std::string
(like FileUtils and Dictionary) so converting back-and-forth from const
char * to std::string is very expensive.
It is faster to have everthing in std::string as soon as possible to
prevent further conversions.
There are still some parts of the code that require conversion, but
most of the code was converted.
2013-11-05 19:02:03 -08:00
Ricardo Quesada
ba7ed6e578
Fixes some compiler warnings
...
The warnings are related to:
* 64-to-32-bit conversion
* shadow variables
2013-11-04 16:31:36 -08:00
minggo
95acb1b9e3
issue #2905 : helloworld build ok on android
2013-10-14 14:01:00 +08:00
minggo
49d7bbd600
issue #2905 : remove sub folders except platform
2013-10-12 15:41:45 +08:00