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

18383 Commits

Author SHA1 Message Date
chuanweizhang2013 8ac09f0631 modify build-cfg.json 2014-04-09 14:56:46 +08:00
chuanweizhang2013 c75466f555 Merge pull request #20 from cocos2d/develop 
update cocos2d-x
 2014-04-09 09:43:01 +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
James Chen 02507ce25f Merge pull request #6173 from lmskater/fix-git-fail-return-value 
[Jenkins][ci skip]: Modified the return value when git fails, it's used for `ci rebuild`
 2014-04-08 17:32:31 +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
lm ca9b4a3196 [Jenkins][ci skip]: Fix return value of git fail 2014-04-08 16:35:01 +08:00
minggo b1d4821988 Merge pull request #6172 from natural-law/issue4666 
Optimize the configuration of copy resources files in templates.
 2014-04-08 16:33:37 +08:00
zhangbin 99f7ca5c40 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into issue4666 2014-04-08 16:27:18 +08:00
zhangbin 12fb27b01e closed #4666, Update the build configuration files in template & update the reference of submodule cocos2d-console. 2014-04-08 16:23:12 +08:00
James Chen 87a3b7e6cb Update AUTHORS [ci skip] 2014-04-08 15:50:26 +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 0db1bbdf68 Merge pull request #6167 from shujunqiao/testcpp-shader 
delete ShaderFail sample in ShaderTest.cpp. It's needed for `autotest`.
 2014-04-08 15:47:01 +08:00
James Chen 2d3cb82816 Update CHANGELOG [ci skip] 2014-04-08 15:45:18 +08:00
James Chen 2703740acd Update AUTHORS [ci skip] 2014-04-08 15:43:38 +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 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
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
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