97883acfb1
closed #4590 , fixed rewind problems
2014-03-28 15:59:04 +08:00
ecad5ea3ce
Fixed `ExtensionTest/CocoStudioComponentsTest` crash after applying PR #6011 .
2014-03-28 14:55:15 +08:00
fd9ab5c4d1
Merge pull request #6039 from Dhilan007/develop_label
...
LabelTTF and LabelBMFont tagged as deprecated
2014-03-28 14:31:11 +08:00
dd73be16e0
fixed indention.
2014-03-28 14:22:51 +08:00
898e2136b1
LabelTTF and LabelBMFont tagged as deprecated
2014-03-28 14:18:01 +08:00
bb1b6f96fb
[AUTO]: updating luabinding automatically
2014-03-28 06:17:06 +00:00
e87f6991cf
User object has to be released before others, since userObject may have a weak reference of this node.
...
It may invoke `node->stopAllAction();` while `_actionManager` is null if the next line is after `CC_SAFE_RELEASE_NULL(_actionManager)`.
2014-03-28 14:09:51 +08:00
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
ceda1b9a9a
[AUTO]: updating luabinding automatically
2014-03-28 03:33:44 +00:00
5c77b4d4b1
Merge pull request #6011 from DarraghCoy/event_listener_crash_fixes
...
closed #4586 : Fix crashes in event dispatch other related safety checks/fixes
2014-03-28 11:28:41 +08:00
688ac51546
Merge pull request #6036 from Dhilan007/develop_label
...
fixed got wrong Rect by Label::getBoundingBox.
2014-03-28 11:18:50 +08:00
0f729126f0
Find another instance where we should null out the node pointer for the current listener after it has been disassociated with the node.
2014-03-27 20:11:37 -07:00
3da695b184
fixed got wrong Rect by Label::getBoundingBox.
2014-03-28 11:03:39 +08:00
2c1eb04124
[ci skip]
2014-03-28 10:45:45 +08:00
b607172e57
Merge pull request #6035 from Dhilan007/develop_label
...
Remove the old implementation of LabelBMFont.
2014-03-28 10:32:04 +08:00
fd5a4acddb
Remove the old implementation of LabelBMFont.
2014-03-28 10:28:44 +08:00
de9c5b34c1
Merge pull request #6032 from boyu0/4573_Particle_setVisible_crash
...
closed #4573 : Set particle visible to false then set to true cause crashes.
2014-03-28 10:08:39 +08:00
3db5d56840
Merge pull request #6031 from Dhilan007/develop_label
...
closed #4561:Fixed read file more than once for label created by different font size.
2014-03-28 10:07:50 +08:00
2bf256db0a
using 'struct' for reduce looks up in the map.
2014-03-28 09:44:16 +08:00
83495e6e9b
Macro wrap some of the other debug checks related to event listeners.
2014-03-27 15:39:52 -07:00
c6cd927ea5
When an event listener is removed from the scene and has a node associated with it, NULL out the node pointer so as not to leave any dangling pointers.
2014-03-27 15:37:16 -07:00
a778d07ecc
Undo most of the rest of the event dispatcher related changes in this fix. Will update with a much more elegant solution that does not disturb the existing code so much and which ensures no dangling pointers.
2014-03-27 15:22:11 -07:00
824efceb3f
Revert "Review feedback: fix memory leak discovered."
...
This reverts commit 07646f1c82
2014-03-27 15:14:37 -07:00
8ee90389b4
Review feedback: Wrap the debug verification in additional macros which are disabled by default.
...
Require the user to enable 'CC_NODE_DEBUG_VERIFY_EVENT_LISTENERS' in ccConfig.h in order to enable the debug checks in debug builds.
2014-03-27 12:29:28 -07:00
6e19da12c3
Review feedback: Remove unnecessary check of EventListener::getSceneGraphPriority() for fixed event listeners.
...
Fixed priority event listeners never have an associated node.
2014-03-27 11:59:07 -07:00
07646f1c82
Review feedback: fix memory leak discovered.
...
Always safe release the listener we retain - shift where release happens to the end of the block. Reproduced the leak using the Xcode Leaks instrument in the RemoveListenerAfterAddingTest and verified fixed after apply this change.
2014-03-27 11:28:27 -07:00
f2cc3a3ce2
Update variable name.
2014-03-27 17:48:16 +08:00
5a572c1797
closed #4561:Fixed read file more than once for label created by different font size.
2014-03-27 17:04:05 +08:00
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
e5ff0912a7
[AUTO]: updating luabinding automatically
2014-03-27 08:43:46 +00:00
2e3b6b62de
Merge pull request #6028 from Dhilan007/develop_label
...
closed #4494:: Easier for set texture parameters of label's cache textures.
2014-03-27 16:40:12 +08:00
408107ff24
closed #4494::Easy to sets texture parameters of label's cache textures.
2014-03-27 15:35:51 +08:00
8cec6b83d9
[AUTO]: updating luabinding automatically
2014-03-27 07:35:51 +00:00
cac4e0bbbc
closed #4569:Texture2D support for update partial texture
2014-03-27 15:11:04 +08:00
7a3e40dd8e
[AUTO]: updating luabinding automatically
2014-03-27 06:55:35 +00:00
c62144c350
Merge pull request #6022 from Dhilan007/develop_label4565
...
closed #4565:fixed logical error in Label::setFontAtlas.
2014-03-27 14:39:30 +08:00
8a8fa743eb
closed #4565:fixed logical error in Label::setFontAtlas.
2014-03-27 14:28:32 +08:00
928e9def8d
closed #102 , add CC_CONSTRUCTOR_ACCESS to CCProtectedNode
2014-03-27 14:27:30 +08:00
33d6b04fb4
[AUTO]: updating luabinding automatically
2014-03-27 05:55:07 +00:00
e52fc981cc
Merge pull request #5977 from dabingnn/develop_fixID_Android_bug
...
Develop fix id android bug
2014-03-27 13:49:53 +08:00
b1859a4cac
[AUTO]: updating luabinding automatically
2014-03-27 03:10:37 +00:00
aaab8881ae
Merge pull request #6003 from pandamicro/LayerGradientCtor
...
Fixed #4566 : Constructor added for LayerGradient
2014-03-27 11:06:49 +08:00
a3a0833401
Merge pull request #6014 from andyque/fix_issue4562
...
closed #4562 , Stopped music could also be resumed on iOS
2014-03-27 11:04:05 +08:00
87384d8ffa
Fixed #4566 : Move LayerGradient's init functions into CC_CONSTRUCTOR_ACCESS section
2014-03-27 10:55:41 +08:00
26a04b38f2
closed #4562 , fix audio resume bug after stop the music
2014-03-27 10:43:57 +08:00
2d5c295f99
Merge branch 'develop' into LayerGradientCtor
2014-03-27 10:14:57 +08:00
7f2255e485
Fixed #4566 : Fix coding style problems
2014-03-27 10:01:46 +08:00
0ee1095e37
Fix crashes in event dispatch other related safety checks/fixes
...
1: Add a fix to prevent events from being sent to scene nodes which are destroyed. Previously when a node was being destroyed it would try to unregister any event listeners it would have. This process would fail however in the case where event dispatching was already underway because we can't modify the listeners list while we are iterating through it. This is a pretty common occurrence since we often tear down & switch scenes in response to button clicks etc. Fix the problem by nulling out the slot for the listener we are removing in this case, so that it's node no longer receives any events after it is destroyed. The event dispatching code will cleanup this unused/nulled slot once the event processing loop has terminated.
2: When removing an event listener in cocos2d::EventDispatcher, ensure immediately it gets removed from the node priority map and dirty nodes set in order to ensure we don't inadvertently access any dangling pointers to nodes.
3: Add debug checks to ensure nodes have no associated event listeners after they are destroyed. This check will catch the problem fixed by (1) if it is still present.
4: Add some extra debug sanity checks in the event dispatcher to ensure nodes are not added to the lists twice and that they are being properly removed from the lists under certain conditions.
5: In cocos2d::Node's destructor NULL out members after releasing them in case they somehow happen to be accessed during the destructor. Move the release of the event dispatcher to the very end, since we need to check against it in debug.
2014-03-26 13:12:44 -07:00
8efb9ad4e0
[AUTO]: updating luabinding automatically
2014-03-26 12:09:41 +00:00
1dbfc9e10a
Merge pull request #5988 from andyque/fix_silder_hittest
...
closed 4560, fixed slider hitTest position
2014-03-26 19:27:41 +08:00
andyque