Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,390 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

18390 Commits

Author SHA1 Message Date
CocosRobot bb1b6f96fb [AUTO]: updating luabinding automatically 2014-03-28 06:17:06 +00:00
James Chen 9090e2015c Merge pull request #6040 from dumganhar/develop 
Two fixes: 1) ParticleSystem should also override onExit to unschedule update since in onEnter, it will be scheduled again. Otherwise, it'll trigger an assert.
2) 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:13:02 +08:00
James Chen 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
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
pandamicro 65f4c23004 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-28 13:56:09 +08:00
shujunqiao 411bb95025 add [director end] command's explain in CCConsole.cpp. 2014-03-28 13:50:06 +08:00
shujunqiao ff4b83813c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test 2014-03-28 13:41:18 +08:00
shujunqiao fb780f82da add [director end] command in CCConsole.cpp. 2014-03-28 13:40:24 +08:00
James Chen 58bb5116ee Merge pull request #6038 from CocosRobot/update_lua_bindings_1395977547 
[AUTO]: updating luabinding automatically
 2014-03-28 11:51:28 +08:00
CocosRobot ceda1b9a9a [AUTO]: updating luabinding automatically 2014-03-28 03:33:44 +00:00
James Chen 095ec8af80 Update CHANGELOG [ci skip] 2014-03-28 11:32:35 +08:00
James Chen b26a5837cb Update AUTHORS [ci skip] 2014-03-28 11:31:13 +08:00
James Chen 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
minggo 688ac51546 Merge pull request #6036 from Dhilan007/develop_label 
fixed got wrong Rect by Label::getBoundingBox.
 2014-03-28 11:18:50 +08:00
Darragh Coy 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
Dhilan007 3da695b184 fixed got wrong Rect by Label::getBoundingBox. 2014-03-28 11:03:39 +08:00
minggo 2c1eb04124 [ci skip] 2014-03-28 10:45:45 +08:00
minggo b607172e57 Merge pull request #6035 from Dhilan007/develop_label 
Remove the old implementation of LabelBMFont.
 2014-03-28 10:32:04 +08:00
Dhilan007 fd5a4acddb Remove the old implementation of LabelBMFont. 2014-03-28 10:28:44 +08:00
minggo 4981c6d8ce [ci skip] 2014-03-28 10:18:39 +08:00
minggo 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
minggo 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
Dhilan007 2bf256db0a using 'struct' for reduce looks up in the map. 2014-03-28 09:44:16 +08:00
shujunqiao ba97b6cf8a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test 2014-03-28 09:25:16 +08:00
Darragh Coy 8ca3cf8a93 Update the test for dangling node pointers in the events system. 
Should be run when the debug event listener verification for nodes is switched on.
 2014-03-27 16:38:06 -07:00
Darragh Coy ba450f786c Fix the new test added to the event dispatcher tests 2014-03-27 16:16:27 -07:00
Darragh Coy 2b7116060d Add a test for events being sent to destroyed nodes. 2014-03-27 16:00:21 -07:00
Darragh Coy 83495e6e9b Macro wrap some of the other debug checks related to event listeners. 2014-03-27 15:39:52 -07:00
Darragh Coy 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
Darragh Coy 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
Darragh Coy 824efceb3f Revert "Review feedback: fix memory leak discovered." 
This reverts commit 07646f1c82.
 2014-03-27 15:14:37 -07:00
Darragh Coy 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
Darragh Coy 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
Darragh Coy 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
Dhilan007 f2cc3a3ce2 Update variable name. 2014-03-27 17:48:16 +08:00
boyu0 9fbb45136a closed #4573: add ParticleVisibleTest. 2014-03-27 17:06:26 +08:00
Dhilan007 5a572c1797 closed #4561:Fixed read file more than once for label created by different font size. 2014-03-27 17:04:05 +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
James Chen 10eee24b0f Merge pull request #6029 from natural-law/develop 
Add tools/bindings-generator & tools/tolua into the  lua template.
 2014-03-27 16:47:08 +08:00
James Chen 2945b6bd4a Merge pull request #6030 from CocosRobot/update_lua_bindings_1395909772 
[AUTO]: updating luabinding automatically
 2014-03-27 16:46:33 +08:00
James Chen 5beb2ee739 Update CHANGELOG [ci skip] 2014-03-27 16:44:58 +08:00
CocosRobot e5ff0912a7 [AUTO]: updating luabinding automatically 2014-03-27 08:43:46 +00:00
James Chen 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
James Chen 1074d88da0 Merge pull request #6027 from CocosRobot/update_lua_bindings_1395905692 
[AUTO]: updating luabinding automatically
 2014-03-27 16:14:24 +08:00
zhangbin 0c82a4a3e0 Add tools/bindings-generator & tools/tolua into the lua project template. 2014-03-27 15:38:01 +08:00
Dhilan007 408107ff24 closed #4494::Easy to sets texture parameters of label's cache textures. 2014-03-27 15:35:51 +08:00
CocosRobot 8cec6b83d9 [AUTO]: updating luabinding automatically 2014-03-27 07:35:51 +00:00
James Chen b824aed1dc Update CHANGELOG [ci skip] 2014-03-27 15:21:52 +08:00
James Chen 44310fea18 Merge pull request #6019 from Dhilan007/develop_label 
closed #4569:Texture2D support for update partial texture
 2014-03-27 15:20:40 +08:00
Dhilan007 cac4e0bbbc closed #4569:Texture2D support for update partial texture 2014-03-27 15:11:04 +08:00