chuanweizhang2013
91e42a17f5
Merge pull request #21 from cocos2d/develop
...
update cocos2d-x
2014-04-10 10:28:12 +08:00
James Chen
9a25613eb2
Merge pull request #6203 from dumganhar/develop
...
Fix for CC_CALLBACK_3 macro
2014-04-10 10:08:34 +08:00
James Chen
7db741cf42
Fix for CC_CALLBACK_3 macro
2014-04-10 10:07:01 +08:00
Anton Sokolchenko
eb568998b2
Update SimpleAudioEngineOpenAL.cpp
2014-04-10 01:00:23 +03:00
Anton Sokolchenko
5fadd6f9ab
Fix memory leak
...
471: If this executed "if (!file.file) ", then
473: dynamically allocated variable "data" is leaked.
2014-04-09 23:25:54 +03:00
minggo
2beed5d398
Merge pull request #6166 from dabingnn/develop_fix_rendererBug
...
Develop fix renderer bug
2014-04-10 00:27:33 +08:00
James Chen
61134426a8
Some fixes detected by xcode analyze
2014-04-09 20:41:09 +08:00
Anton Sokolchenko
87015ae888
2026:72: Result of 'malloc' is incompatible with type 'unsigned char *'
...
2026:72: Result of 'malloc' is converted to a pointer of type 'unsigned char', which is incompatible with sizeof operand type 'unsigned char *'
2014-04-09 11:37:56 +03:00
samuele3hu
b6579aa322
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label
2014-04-09 16:25:44 +08:00
James Chen
d71483632f
Merge pull request #6187 from Dhilan007/develop_activity
...
closed #4659:Remove the usage of OpenSL
2014-04-09 15:39:06 +08:00
James Chen
39cca5012c
Merge pull request #6188 from Mazyod/develop-cocos2dx
...
[FIX]: HTTPClient should not report 2xx status codes as errors!
2014-04-09 15:27:52 +08:00
James Chen
671832acb7
Merge pull request #6184 from shujunqiao/lua-manual-console
...
[lua] add wait/send/addCommand function for manual-console in lua_cocos2dx_manual.cpp
2014-04-09 15:16:27 +08:00
Mazyad Alabduljaleel
1928a0cb07
= [FIX]: HTTPClient should not report 2xx status codes as errors!
2014-04-09 11:07:51 +04:00
Dhilan007
d310d8d099
closed #4659:Remove the usage of OpenSL
2014-04-09 14:57:07 +08:00
samuele3hu
1c124f52ad
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label
2014-04-09 14:29:04 +08:00
samuele3hu
dbd01051d8
close #4721:clone for EventListeners of lua didn't clone the related property
2014-04-09 14:26:05 +08:00
shujunqiao
2c2876698d
add wait/send/addCommand function for manual-console in lua_cocos2dx_manual.cpp.
2014-04-09 14:20:02 +08:00
James Chen
c344a1e349
Merge pull request #6182 from Dhilan007/develop_activity
...
closed #4714:Fixed Cocos2dxHelper.runOnGLThread() can not work
2014-04-09 14:08:06 +08:00
James Chen
d93a7e6445
Merge pull request #6177 from DarraghCoy/small_dangling_ptr_fix
...
Small dangling ptr fix to EventDispatcher::removeEventListenersForTarget
2014-04-09 13:22:24 +08:00
chuanweizhang2013
c75466f555
Merge pull request #20 from cocos2d/develop
...
update cocos2d-x
2014-04-09 09:43:01 +08:00
Darragh Coy
117f22d895
Tweak formatting and change spaces to tabs so indentation appears consistent on github.
2014-04-08 08:47:26 -07:00
Darragh Coy
0082900d10
Small dangling pointer tweak/fix to CCEventDispatcher
...
If cleaning a target node that has a listener in the 'to be added' listeners list then ensure that listener does not have a stale reference to the node. This is a minor tweak in addition to pull request 6160 (https://github.com/cocos2d/cocos2d-x/pull/6160 ).
2014-04-08 08:46:09 -07:00
Dhilan007
c378b42191
closed #4714:Fixed Cocos2dxHelper.runOnGLThread() can not work
2014-04-08 21:08:20 +08:00
shujunqiao
9391906738
modify const char* to std::string in CCConsole.
2014-04-08 18:20:06 +08:00
minggo
6208943cb1
Merge pull request #6168 from heliclei/fix-console-upload
...
closed #4533:fix console upload hang issue
2014-04-08 17:55:15 +08:00
minggo
e2252cafe3
Merge pull request #6174 from minggo/change-to-private
...
change QuadCommand::generateMaterialID() to private
2014-04-08 17:54:36 +08:00
minggo
ccbd77309d
change QuadCommand::generateMaterialID() to private
2014-04-08 17:49:18 +08:00
minggo
0c2b654410
Merge pull request #6171 from minggo/iss4683-assert_not_thread_safe
...
use assert because CCASSERT is not thread safe
2014-04-08 17:16:28 +08:00
Huabing.Xu
7f1fb13113
closed #4629 : remove unused _renderStack
2014-04-08 16:54:00 +08:00
James Chen
e1f2b71429
Merge pull request #6161 from DarraghCoy/check_node_not_running_when_destroyed
...
Adding extra CCNode verification in Node's destructor
2014-04-08 15:49:22 +08:00
James Chen
28ebec46dc
Merge pull request #6151 from mgcL/ScriptHandlerMgr-memory-free
...
add destroyInstance for ScriptHandlerMgr
2014-04-08 15:41:18 +08:00
James Chen
5df765ef0c
Merge pull request #6169 from dumganhar/iss4710-eventdispatcher-crash
...
closed #4710 : [win32] Crash in EventDispatcher if game starts up with mouse moving frequently
2014-04-08 15:31:52 +08:00
James Chen
e04b820cfc
closed #4711 : [win32] Passing empty string to FileUtils::isFileExist may also return true
2014-04-08 15:24:47 +08:00
James Chen
8f451d48a1
issue #4710 : Fixed wrong indention.
2014-04-08 15:11:04 +08:00
James Chen
49bba30409
closed #4710 : [win32] Crash in EventDispatcher if game starts up with mouse moving frequently
2014-04-08 15:08:34 +08:00
minggo
e28093ee1a
closed #4683 : use assert because CCASSERT is not thread safe
2014-04-08 14:53:57 +08:00
heliclei
4e1284bd45
closed #4533:fix console upload hang issue
2014-04-08 14:52:53 +08:00
James Chen
546db2de4a
Unregistered listener when it's removed from _toAddedListeners.
2014-04-08 11:17:38 +08:00
Darragh Coy
9a6b93eae1
Add extra CCNode verification
...
Add a check to the CCNode destructor to catch a common cocos2d-x programming mistake - forgetting to call base class onExit() in derived class onExit() implementations. We can check for this invalid API usage by checking if the node is still marked as running on destruction. If the node still thinks it's running then it's likely the cleanup logic performed by Node::onExit() was not done.
2014-04-07 17:05:42 -07:00
Darragh Coy
79b5dff795
CCEventDispatcher crash fix
...
Fix possible crashes which could be caused by the EventDispatcher having listeners associated with nodes are destroyed. Catch the case where a node registers a listener while we are dispatching events and gets destroyed while that event is still being dispatched. Check the list of nodes to be added into the event dispatcher fully when we are cleaning listeners for a target node.
This issue was found using the extra debug verification in this pull request:
https://github.com/cocos2d/cocos2d-x/pull/6011
2014-04-07 16:19:26 -07:00
Huabing.Xu
1a7f46598f
closed #4629 : fix bug for group command
2014-04-07 22:51:32 +08:00
James Chen
1b85be2b9b
Merge pull request #6150 from mgcL/Value-memory-leak
...
A potential memory leak in value's default constructor.
2014-04-07 16:32:01 +08:00
dbaack
6262c9c910
Fixed a bug where an event listener removed from the event dispatcher while it is still in the _toAddedListeners vector would never have _isRegistered set to false on removal. This causes it to fail an assert if it is attempted to be added to the event dispatcher again later.
2014-04-06 21:59:40 -07:00
mgcL
d9e0124ff8
delete _scriptHandlerMgr in destruct will cause stack overflow
2014-04-05 21:26:56 +08:00
mgcL
a5da6d71b4
add destroyInstance for ScriptHandlerMgr
2014-04-05 21:09:49 +08:00
mgcL
a3a3fa0907
fix Value's memory leak
2014-04-05 18:55:55 +08:00
Ricardo Quesada
f1a2db9006
Merge pull request #6140 from dumganhar/render-clean
...
Adds `Renderer::clean`, and fixes crash in `PerformanceTest/Node children Test`.
2014-04-04 13:34:29 -07:00
CocosRobot
cd33967dc4
[AUTO]: updating luabinding automatically
2014-04-04 10:45:34 +00:00
James Chen
541d4dea0c
Merge pull request #6105 from andyque/feature3636
...
Added create functions with parameters for all ui controls
2014-04-04 18:34:59 +08:00
andyque
4b6aa2a22c
closed #4636 . remove Hungary style
2014-04-04 18:26:53 +08:00