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
James Chen
a8bb3d794a
Merge pull request #6025 from CocosRobot/update_cocosfiles_1395903852
...
[AUTO][ci skip]: updating cocos2dx_files.json
2014-03-27 15:08:24 +08:00
CocosRobot
b779ef0c27
[AUTO][ci skip]: updating cocos2dx_files.json
2014-03-27 07:04:13 +00:00
James Chen
91ca76515b
Merge pull request #6024 from CocosRobot/update_lua_bindings_1395903260
...
[AUTO]: updating luabinding automatically
2014-03-27 14:56:05 +08:00
CocosRobot
7a3e40dd8e
[AUTO]: updating luabinding automatically
2014-03-27 06:55:35 +00:00
James Chen
c80fdaa54f
Merge pull request #6020 from samuele3hu/develop_test
...
Update the cocos2dx.ini for lua binding
2014-03-27 14:40:56 +08:00
James Chen
1da2952c0a
Merge pull request #6023 from lmskater/fix-generator-bindings-fail
...
[Jenkins] Make build as failed when generating bindings fails
2014-03-27 14:40:06 +08:00
James Chen
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
lm
edd14e6765
[Jenkins] Make build as failed when generating bindings fails
2014-03-27 14:28:40 +08:00
Dhilan007
8a8fa743eb
closed #4565:fixed logical error in Label::setFontAtlas.
2014-03-27 14:28:32 +08:00
minggo
3aaf56f91f
Merge pull request #6021 from andyque/fix_temp
...
closed #102 , add CC_CONSTRUCTOR_ACCESS to CCProtectedNode
2014-03-27 14:27:49 +08:00
andyque
928e9def8d
closed #102 , add CC_CONSTRUCTOR_ACCESS to CCProtectedNode
2014-03-27 14:27:30 +08:00
samuele3hu
a64f44d6b2
Add lua binding for `getOpenGLView` of `Director`
2014-03-27 14:16:20 +08:00
samuele3hu
7afa977ac3
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_test
2014-03-27 14:10:43 +08:00
samuele3hu
8b754c6257
Update coco2dx.ini for binding `ProtectedNode` class
2014-03-27 14:08:19 +08:00
James Chen
18ce311011
Merge pull request #6017 from CocosRobot/update_lua_bindings_1395899624
...
[AUTO]: updating luabinding automatically
2014-03-27 13:59:33 +08:00
CocosRobot
33d6b04fb4
[AUTO]: updating luabinding automatically
2014-03-27 05:55:07 +00:00
minggo
e52fc981cc
Merge pull request #5977 from dabingnn/develop_fixID_Android_bug
...
Develop fix id android bug
2014-03-27 13:49:53 +08:00
James Chen
b028c29a7d
Merge pull request #6016 from samuele3hu/develop_test
...
Modify lua project setting and replace NativeActivity with Cocos2dActivity
2014-03-27 11:29:55 +08:00
samuele3hu
6fbf1b4cdf
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_test
2014-03-27 11:21:20 +08:00
samuele3hu
06f4cb31b2
Replace NativeActivity with Cocos2dActivity and modify lua android project setting.
2014-03-27 11:18:13 +08:00