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

12733 Commits

Author SHA1 Message Date
James Chen 48ce5e39fe EventDispatcher is managed by Director now, like Scheduler and ActionManager. 2013-10-26 15:04:01 +08:00
James Chen 6c6757a04e issue #3069: Moving s_eventPriorityIndex to member variable of EventDispatcher. 2013-10-25 17:03:50 +08:00
James Chen 063b012a9c int --> Event::Type 2013-10-25 16:43:04 +08:00
James Chen cb7e0b391b issue #3069: Removing unused variables in CCEventListenerTouch.h. 2013-10-25 16:37:40 +08:00
James Chen 9bf44a6c83 issue #3069: Renaming 'removeListeners' to 'removeEventListeners'. 2013-10-25 16:34:26 +08:00
James Chen cf20329b71 issue #3069: Removing unused codes in UILayer. 2013-10-25 16:33:54 +08:00
James Chen 0d2d522f12 issue #3069: int --> EventListener::Type. 2013-10-25 16:15:37 +08:00
James Chen 262b54eef2 issue #3069: Updating ScrollView. 2013-10-25 16:06:52 +08:00
James Chen 312e1bd27c [Dispatcher] Updating comments. 2013-10-25 15:40:21 +08:00
James Chen 1339ef7ecb [JSB] These are only for v2.x JSB compatibility after removing controller codes in Layer. 2013-10-25 15:20:06 +08:00
James Chen efa5afb1c3 [Dispatcher] Removing unused codes in Layer. 2013-10-25 15:19:25 +08:00
James Chen 30a3199a91 [Dispatcher] Removing unused codes. 2013-10-25 15:19:04 +08:00
James Chen 27b71ba73c Use integer as event type and listener type. 2013-10-25 10:53:47 +08:00
James Chen c4f9acbee7 disable DUMP_LISTENER_ITEM_PRIORITY_INFO. use std::unordered_map instead of std::map. 2013-10-25 10:53:47 +08:00
James Chen b5cac51f97 PhysicsTest update. 2013-10-25 10:53:47 +08:00
James Chen 9c4bc9e8ed Update physicsTest. 2013-10-25 10:53:47 +08:00
James Chen 7854a13278 Small fix for Bug-422.cpp and MenuTest.cpp. 2013-10-25 10:53:47 +08:00
James Chen 9632cd7949 memoryleak fix. 2013-10-25 10:53:47 +08:00
James Chen dc6e201eb6 bug fix for eventdispatcher. 2013-10-25 10:53:46 +08:00
James Chen 5ecb664a58 crash and memory leak fix. 2013-10-25 10:53:46 +08:00
James Chen aeef62d893 bug fix for EventDispatcher. 2013-10-25 10:53:46 +08:00
James Chen e59c49a5e3 fix crash. 2013-10-25 10:53:46 +08:00
James Chen a56475e872 Updating jsb. 2013-10-25 10:53:46 +08:00
James Chen b131e8c509 Update menu test. 2013-10-25 10:53:46 +08:00
James Chen 6f9bee5b1a bug fix in EventDispatcher. 2013-10-25 10:53:46 +08:00
James Chen 9ed263056c Use eventDispatcher to dispatch event. Remove controller codes in Layer. 2013-10-25 10:53:46 +08:00
James Chen 1f3863e787 Event Dispatcher refactor commit. TestCpp could run. 2013-10-25 10:53:45 +08:00
James Chen f7e2c63230 Refactor event dispatcher. Remove non-node relative member variables. 2013-10-25 10:53:45 +08:00
James Chen cfaef2a01a Adding onEnterHook, onXXXHook for Node. 2013-10-25 10:53:45 +08:00
James Chen 779e539658 Remove event controller codes from Layer class. HelloCpp works. 2013-10-25 10:53:45 +08:00
James Chen 0380059445 Merge pull request #4007 from dumganhar/update-project 
[JSB] Fixing compilation errors for iOS and Mac projects.
 2013-10-24 19:53:09 -07:00
James Chen b4eb970589 [JSB] Fixing compilation errors for iOS and Mac projects. 2013-10-25 10:50:03 +08:00
boyu0 fdcf019665 issue #2771: implement contact callbacks 2013-10-25 10:31:22 +08:00
James Chen 73b02875cb Merge pull request #4004 from Dhilan007/di0004 
issues #2905:split jsbinding module
 2013-10-24 04:07:06 -07:00
Dhilan007 56ef197146 update the reference to cocos2d-x repo. 2013-10-24 18:36:36 +08:00
Dhilan007 08960f1510 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into di2893 2013-10-24 18:16:44 +08:00
James Chen f2584f9730 Update CHANGELOG 2013-10-24 18:04:13 +08:00
James Chen 342003f7b2 Update AUTHORS 2013-10-24 18:03:15 +08:00
James Chen d8683ef705 Merge pull request #3988 from lite3/develop 
closed #3060: The Node's anchor point was changed after being added to ScrollView.
 2013-10-24 03:01:49 -07:00
Dhilan007 fd993e2fa2 issues #2905:split jsbinding module 2013-10-24 17:54:57 +08:00
James Chen 16a3c39402 Merge pull request #4000 from Dhilan007/di0002 
issues #2905:add miss file
 2013-10-24 02:32:35 -07:00
James Chen 10329de46c Merge pull request #4002 from boyu0/iss2771_physical 
issue #2771 physical
 2013-10-24 02:31:40 -07:00
boyu0 a8ddca81bd issue #2771: fix some compile error in win32 2013-10-23 18:52:09 +08:00
minggo 914269b4bd Merge pull request #4001 from minggo/iss2905-adjust_folder 
issue #2905:ndk-r8e build ok now
 2013-10-23 02:47:05 -07:00
minggo d07d054a01 issue #2905:ndk-r8e build ok now 2013-10-23 17:44:20 +08:00
boyu0 912a9a2887 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-10-23 17:41:52 +08:00
boyu0 899f720efa issue #2771: implement getShapeAtPoint and getShapesAtPoint 2013-10-23 17:28:23 +08:00
Dhilan007 3305dd1de3 issues #2905:add miss file 2013-10-23 17:05:27 +08:00
minggo 189ff009f2 Merge pull request #3999 from minggo/iss2905-adjust_folder 
issue #2905: android samples run ok
 2013-10-23 01:53:20 -07:00
James Chen c117431b2a Merge pull request #3998 from Dhilan007/0001 
adjust std:function support 10 parameter
 2013-10-23 01:50:30 -07:00