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

18218 Commits

Author SHA1 Message Date
samuele3hu 06f4cb31b2 Replace NativeActivity with Cocos2dActivity and modify lua android project setting. 2014-03-27 11:18:13 +08:00
James Chen 6248e3330a Merge pull request #6015 from CocosRobot/update_lua_bindings_1395889786 
[AUTO]: updating luabinding automatically
 2014-03-27 11:13:59 +08:00
James Chen 6f425c96cb Merge pull request #6007 from Dhilan007/develop_testcase 
Remove the old implementation of LabelTTF in test case.
 2014-03-27 11:13:37 +08:00
CocosRobot b1859a4cac [AUTO]: updating luabinding automatically 2014-03-27 03:10:37 +00:00
James Chen aaab8881ae Merge pull request #6003 from pandamicro/LayerGradientCtor 
Fixed #4566: Constructor added for LayerGradient
 2014-03-27 11:06:49 +08:00
James Chen 3fd5039b97 Update CHANGELOG [ci skip] 2014-03-27 11:05:57 +08:00
pandamicro 751cf488f0 Merge pull request #6 from pandamicro/develop 
Fixed #4566: Fix bugs with LayerGradient constructor fix
 2014-03-27 11:05:26 +08:00
James Chen a3a0833401 Merge pull request #6014 from andyque/fix_issue4562 
closed #4562, Stopped music could also be resumed on iOS
 2014-03-27 11:04:05 +08:00
pandamicro f0bb69bc5f Revert "Reverse CONSTRUCTOR_ACCESS" 
This reverts commit 44d446ef1d.
 2014-03-27 10:59:47 +08:00
pandamicro cd9509947d Merge branch 'LayerGradientCtor' into develop 2014-03-27 10:59:29 +08:00
shujunqiao d38f873ecc Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test 2014-03-27 10:56:29 +08:00
pandamicro 87384d8ffa Fixed #4566: Move LayerGradient's init functions into CC_CONSTRUCTOR_ACCESS section 2014-03-27 10:55:41 +08:00
James Chen 7616d8d8e5 Merge pull request #6013 from natural-law/develop 
Update the reference of submodule "cocos2d-console".
 2014-03-27 10:49:31 +08:00
andyque 26a04b38f2 closed #4562, fix audio resume bug after stop the music 2014-03-27 10:43:57 +08:00
pandamicro 6bdf4e9684 Merge branch 'LayerGradientCtor' into develop 2014-03-27 10:37:46 +08:00
pandamicro 87f9eb3217 Fixed #4566: Remove autorelease for create construct in LayerTest 2014-03-27 10:25:39 +08:00
pandamicro 413e0010f5 Fixed #4566: Fix LayerTest bug 2014-03-27 10:22:04 +08:00
pandamicro 2d5c295f99 Merge branch 'develop' into LayerGradientCtor 2014-03-27 10:14:57 +08:00
pandamicro 7f2255e485 Fixed #4566: Fix coding style problems 2014-03-27 10:01:46 +08:00
zhangbin 269c63ec69 Update the reference of submodule "cocos2d-console". 2014-03-27 09:50:16 +08:00
Darragh Coy 0ee1095e37 Fix crashes in event dispatch other related safety checks/fixes 
1: Add a fix to prevent events from being sent to scene nodes which are destroyed. Previously when a node was being destroyed it would try to unregister any event listeners it would have. This process would fail however in the case where event dispatching was already underway because we can't modify the listeners list while we are iterating through it. This is a pretty common occurrence since we often tear down & switch scenes in response to button clicks etc. Fix the problem by nulling out the slot for the listener we are removing in this case, so that it's node no longer receives any events after it is destroyed. The event dispatching code will cleanup this unused/nulled slot once the event processing loop has terminated.

2: When removing an event listener in cocos2d::EventDispatcher, ensure immediately it gets removed from the node priority map and dirty nodes set in order to ensure we don't inadvertently access any dangling pointers to nodes.

3: Add debug checks to ensure nodes have no associated event listeners after they are destroyed. This check will catch the problem fixed by (1) if it is still present.

4: Add some extra debug sanity checks in the event dispatcher to ensure nodes are not added to the lists twice and that they are being properly removed from the lists under certain conditions.

5: In cocos2d::Node's destructor NULL out members after releasing them in case they somehow happen to be accessed during the destructor. Move the release of the event dispatcher to the very end, since we need to check against it in debug.
 2014-03-26 13:12:44 -07:00
Dhilan007 93511a878b Remove the old implementation of LabelTTF in test case. 2014-03-26 23:33:58 +08:00
James Chen 5ba2cbb5a0 Update AUTHORS [ci skip] 2014-03-26 20:15:13 +08:00
James Chen 2c616fc9da Merge pull request #6005 from flashjay/develop 
remove deprecated code in lua tests & template
 2014-03-26 20:12:10 +08:00
James Chen 57b298a57a Merge pull request #6006 from CocosRobot/update_lua_bindings_1395835692 
[AUTO]: updating luabinding automatically
 2014-03-26 20:10:43 +08:00
CocosRobot 8efb9ad4e0 [AUTO]: updating luabinding automatically 2014-03-26 12:09:41 +00:00
James Chen 049e758cbf Merge pull request #6004 from dumganhar/develop 
Fixed  <alloca.h> wasn't exist on Windows
 2014-03-26 20:04:19 +08:00
James Chen 8ca714fa67 Windows will not include <alloca.h>. 2014-03-26 19:43:34 +08:00
faryang-rmbp 491dc202df remove deprecated code in lua tests & template 2014-03-26 19:42:07 +08:00
James Chen d9b4b70ed7 Removed unused include file. 2014-03-26 19:28:10 +08:00
James Chen 1dbfc9e10a Merge pull request #5988 from andyque/fix_silder_hittest 
closed 4560,  fixed slider hitTest position
 2014-03-26 19:27:41 +08:00
James Chen 4c848861aa Merge pull request #6001 from CocosRobot/update_cocosfiles_1395830476 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-03-26 19:15:06 +08:00
James Chen 2a5c2b0e7e Merge pull request #6002 from CocosRobot/update_lua_bindings_1395830496 
[AUTO]: updating luabinding automatically
 2014-03-26 19:14:42 +08:00
pandamicro 670c3349d5 Merge pull request #5 from pandamicro/develop 
Fixed #4566: Constructor added for LayerGradient and sync -x
 2014-03-26 18:54:53 +08:00
pandamicro 44d446ef1d Reverse CONSTRUCTOR_ACCESS 2014-03-26 18:48:01 +08:00
pandamicro c08bf69370 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into LayerGradientCtor 2014-03-26 18:46:00 +08:00
pandamicro 63772f7d72 Fixed #4566: Constructor added for LayerGradient 2014-03-26 18:45:08 +08:00
CocosRobot ebc09373e3 [AUTO]: updating luabinding automatically 2014-03-26 10:42:58 +00:00
CocosRobot 41110ec49a [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-26 10:41:17 +00:00
James Chen 8d035f4333 Update CHANGELOG [ci skip] 2014-03-26 18:31:53 +08:00
James Chen cdd7356512 Merge pull request #5969 from nutty898/develop_nutty_modifylayout_add_Boxes 
closed #4534: Adding HBox, VBox layouts, refactoring 'doLayout' function.
 2014-03-26 18:30:17 +08:00
James Chen 789044f51d Merge pull request #6000 from CocosRobot/update_lua_bindings_1395829485 
[AUTO]: updating luabinding automatically
 2014-03-26 18:27:32 +08:00
CocosRobot 6e86e65038 [AUTO]: updating luabinding automatically 2014-03-26 10:25:55 +00:00
James Chen 849d7b9109 Merge pull request #5996 from chengstory/AddNewCreateNodeWay 
Adding support of using CCComRender as parent for attached component
 2014-03-26 18:20:34 +08:00
CaiWenzhi a05969c395 Move layout "exe" to cpp 2014-03-26 17:58:53 +08:00
zhangcheng f564c4e34a 1. Spirte -> Sprite. 
2. _EMPTYNODE -> EMPTY_NODE.
 2014-03-26 17:55:35 +08:00
zhangcheng c1ff610277 use capital letters for enum. 2014-03-26 17:21:09 +08:00
zhangcheng 1e6b9f7d9f remove isRenderer. 2014-03-26 17:02:37 +08:00
zhangcheng 58a61d94fb add use CCComRender as parent for attaching component 2014-03-26 16:39:32 +08:00
James Chen faa815eee2 Update CHANGELOG [ci skip] 2014-03-26 16:36:04 +08:00