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

18674 Commits

Author SHA1 Message Date
James Chen b0c0d1e82b Merge pull request #6165 from natural-law/develop 
Update the reference of submodule plugin-x
 2014-04-08 15:37:24 +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 ec6714cc82 Merge pull request #6170 from dumganhar/iss4711-fileexist-win32 
closed #4711: [win32] Passing empty string to FileUtils::isFileExist may also return true
 2014-04-08 15:31:17 +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
shujunqiao fb777b1a1d [ci skip], delete ShaderFail sample in ShaderTest.cpp. 2014-04-08 14:52:17 +08:00
shujunqiao fae742c0b8 modify ShaderTest.cpp not crah to autotest. 2014-04-08 14:32:25 +08:00
zhangbin a2e4aeb857 Update the reference of submodule plugin-x 2014-04-08 14:31:21 +08:00
James Chen 0834c07fa3 Update CHANGELOG [ci skip] 2014-04-08 11:37:00 +08:00
James Chen ecf784646d Update AUTHORS [ci skip] 2014-04-08 11:34:01 +08:00
heliclei 798708f775 fix autotest touch hang:run test scene constructor in cocos thread 2014-04-08 11:29:42 +08:00
James Chen c2b8557efb Merge pull request #6162 from dumganhar/pull/6160 
Fixed a potential crash in EventDispatcher, based on PR #6160
 2014-04-08 11:25:59 +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 bb85df66b1 Add an event dispatcher test 
Add an event dispatcher test to help reproduce crashes fixed by the previous commit and to verify that the fix still works.
 2014-04-07 16:46:03 -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
Huabing.Xu 1b0c55ef15 issue #4629: test case add a spriteInGroup instead of sprite, the sprite can not be seen now 2014-04-07 22:31:24 +08:00
Huabing.Xu beda294be1 issue #4629: add test case for group command 2014-04-07 22:02:43 +08:00
James Chen f9ac3c82fc Update CHANGELOG [ci skip] 2014-04-07 16:34:56 +08:00
James Chen cdb68cc918 Update AUTHORS [ci skip] 2014-04-07 16:33:40 +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
James Chen 0d8c70e93f Update AUTHORS [ci skip] 2014-04-07 16:20:47 +08:00
James Chen cd2a74d4ec Merge pull request #6156 from zakmandhro/patch-1 
A typo fix in RELEASE_NOTES.md
 2014-04-07 16:19:38 +08:00
James Chen 7019a8cf83 Update CHANGELOG [ci skip] 2014-04-07 16:18:49 +08:00
James Chen 92d1169747 Update AUTHORS [ci skip] 2014-04-07 16:16:51 +08:00
James Chen 7142dcfce3 Merge pull request #6157 from dbaack/remove_event_listener_fix 
closed #4700: Removing and re-adding an event listener will trigger an assert.
 2014-04-07 16:14:48 +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
Zak Mandhro 03b5c879a7 Update RELEASE_NOTES.md 2014-04-06 21:42:34 -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
James Chen 8c1035c132 Merge pull request #6147 from CocosRobot/update_lua_bindings_1396608271 
[AUTO]: updating luabinding automatically
 2014-04-04 19:42:28 +08: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
Nick Barrios eae1ccb279 CCGLView: Remove frameZoomFactor param from createWithFullScreen overload. 2014-04-04 06:26:00 -04:00
cw c0fe791aae Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into luaruntime 
Conflicts:
	templates/lua-template-runtime/src/main.lua
 2014-04-04 18:17:54 +08:00
James Chen 2f0d561f03 Merge pull request #6144 from shujunqiao/cocos-console-test-add 
[ci skip]add send email in cocos-console-test.py.
 2014-04-04 18:06:38 +08:00
minggo cf3cf86537 [ci skip] 2014-04-04 18:04:29 +08:00
Nick Barrios 58224d9b23 CCGLView: Add createWithFullscreen overloaded method that allows passing in Size, to set video mode. 2014-04-04 06:02:29 -04:00
minggo 439b30434e Merge pull request #6097 from newnon/android_crash_fix 
Android crash fix on new devices
 2014-04-04 18:01:59 +08:00
andyque e346ed3559 closed #4636. done 2014-04-04 17:38:58 +08:00
andyque e20b3d8eb8 issue #4636. refactor SliderReader 2014-04-04 17:35:15 +08:00
andyque af5fe04480 issue #4636. refactor LoadingBarReader 2014-04-04 17:25:20 +08:00
andyque a4e0c1a6e2 issue #4636. refactor LayoutReader 2014-04-04 17:21:23 +08:00