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

18080 Commits

Author SHA1 Message Date
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
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