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

4839 Commits

Author SHA1 Message Date
CaiWenzhi 4843046d17 Merge GUI to develop step 1; 2013-09-16 17:12:15 +08:00
James Chen 0121d3033b Merge pull request #3614 from dumganhar/iss2087-new-event-dispatcher 
issue #2087: [EventDispatcher] Comment fixes. Adding a new test. Event priority fix, the lower value, the higher priority.
 2013-09-16 01:52:16 -07:00
James Chen 501ed32973 issue #2087: [dispatcher] Fix of the listener of specified type is null. 2013-09-16 16:40:47 +08:00
James Chen abf834731a issue #2087: [dispatcher] Making Node::updateEventPriorityIndex to inline function. 2013-09-16 16:39:59 +08:00
James Chen 60645a6702 issue #2087: [dispatcher] Changes event priority. The lower value is, the higher priority will be gotten. 2013-09-16 15:45:56 +08:00
minggo 27381fc83f Merge pull request #3562 from bassarisse/develop 
Win32 icons on template
 2013-09-15 23:44:11 -07:00
James Chen 16b13ce522 issue #2087: [dispatcher] Updating some comments for new event dispatcher. 2013-09-16 14:43:57 +08:00
James Chen 050de08b8f issue #2087: [dispatcher] Node::getEventPriority is a private method now. 2013-09-16 14:43:07 +08:00
minggo 2a315e53b8 Merge pull request #3402 from j4m3z0r/develop-emscripten 
Port my variant of font-rendering over to dev branch -- adds correct ali...
 2013-09-15 22:52:33 -07:00
minggo f47ce3f5bc Merge pull request #3607 from samuele3hu/developTest 
Reset the addChild functions of SpriteBatchNode and add some lua deprecated functions
 2013-09-15 22:45:32 -07:00
minggo e4f8929898 Merge pull request #3606 from dabingnn/issue_2808_glfw_bug_enhancement 
Issue 2808 glfw bug enhancement
 2013-09-15 20:18:02 -07:00
minggo 81a26d44f6 Merge pull request #3596 from dumganhar/new-event-dispatcher-rename 
[New Event Dispatcher] Using rename registerEventListener to addEventListener, unregisterEventListener to removeEventListener.
 2013-09-15 20:13:51 -07:00
samuele3hu faed7a3d36 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTest 2013-09-16 10:54:55 +08:00
samuele3hu a3a915ead2 Reset the addChild functions of SpriteBatchNode and add some lua deprecated functions 2013-09-16 10:54:12 +08:00
James Chen 3b798317d4 [dispatcher] Some performance improves. Using std::for_each and range loop, and removing unneeded std::map::find. 2013-09-16 10:44:24 +08:00
James Chen 3e01dd5edf [dispatcher] Using std::vector instead of std::list for EventListenerItem container. 2013-09-15 21:58:54 +08:00
James Chen bfdc2a0efe [dispatcher] Adding argument for whether to sort listeners when dispatching events. 2013-09-15 18:25:44 +08:00
James Chen 23e80857fa [dispatcher] Defines TOUCH_PERF_DEBUG to enable setting touches in TouchEvent. 2013-09-15 17:49:09 +08:00
James Chen 499e8caf7a [dispatcher] Updating the declare of event listeners in Layer. Using more specified type. 2013-09-15 17:48:29 +08:00
James Chen d940e01bc1 [dispatcher] Supporting changing priority from fixed value to node or from node to fixed value. 2013-09-15 12:17:01 +08:00
James Chen 1b9658f5ad [dispatcher] Adding Node::dissociateEventListener method. 2013-09-15 12:14:48 +08:00
James Chen 8102272b15 [dispatcher] Updating comments of EventDispatcher, renaming some functions and some performance improves when dispatching event. 2013-09-15 11:07:27 +08:00
Huabing.Xu 9440aa7a99 issue #2808: refractor setFrameZoomFactor() access, change init() parameter (linux windows version) 2013-09-14 22:48:14 +08:00
samuele3hu 85ca0136f0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Bridge 2013-09-14 19:53:08 +08:00
James Chen 997a5a36c1 [dispatcher] Renaming 'registerEventListenerXXX' to 'addEventListenerXXX'. 2013-09-14 09:02:49 +08:00
James Chen dd7bfd7b60 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase 
Conflicts:
	cocos2dx/CCDirector.h
	cocos2dx/keyboard_dispatcher/CCKeyboardDispatcher.h
	cocos2dx/keypad_dispatcher/CCKeypadDelegate.h
	cocos2dx/keypad_dispatcher/CCKeypadDispatcher.h
	cocos2dx/layers_scenes_transitions_nodes/CCLayer.h
	cocos2dx/menu_nodes/CCMenu.h
	cocos2dx/platform/CCAccelerometerDelegate.h
	cocos2dx/platform/android/CCAccelerometer.h
	cocos2dx/platform/ios/CCAccelerometer.h
	cocos2dx/platform/mac/CCAccelerometer.h
	cocos2dx/platform/win32/CCAccelerometer.h
	cocos2dx/script_support/CCScriptSupport.h
	cocos2dx/touch_dispatcher/CCTouchDelegateProtocol.h
	cocos2dx/touch_dispatcher/CCTouchDispatcher.h
	cocos2dx/touch_dispatcher/CCTouchHandler.h
	extensions/CocoStudio/Components/CCInputDelegate.h
 2013-09-13 19:06:09 +08:00
Huabing.Xu 0af0951c35 issue #2808: refractor setFrameZoomFactor() access, change init() parameter 2013-09-13 18:21:12 +08:00
Huabing.Xu 86306a842d issue #2808: 1. retina support 2. frameZoomFactor 2013-09-13 18:09:11 +08:00
James Chen 2fd655dc57 [dispatcher] Using cocos2d-x memory model instead of std::shared_ptr. It should be unified. 2013-09-13 18:00:56 +08:00
Huabing.Xu 5f1e5c505c issue #2808: when move window, set OpenGL viewport again 2013-09-13 17:11:35 +08:00
samuele3hu d8bd65b2e8 issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
James Chen 40c410b78d file mode changed, cocos2d.h from 100755 -> 100644 2013-09-13 16:37:47 +08:00
James Chen 490c74fd99 Unneeded cast fix. 2013-09-13 16:37:19 +08:00
James Chen 1f0a883dbd [dispatcher] Checking whether the listener was registered. 2013-09-13 16:36:54 +08:00
James Chen 72c978f9fb [dispatcher] Adding clone method for listener class. 2013-09-13 16:36:25 +08:00
James Chen 838b059b45 [dispatcher] Adding (s|g)etCurrentTarget for Event. 2013-09-13 16:34:34 +08:00
samuele3hu 1d4d1f251c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into doxygen 
Conflicts:
	cocos2dx/label_nodes/CCLabel.h
 2013-09-13 14:04:22 +08:00
samuele3hu 5ddd9ae23c issue #2784:Delete class destuctor js-binding and lua-binding document 2013-09-13 13:52:42 +08:00
minggo fd92708d16 Merge pull request #3588 from minggo/label-best-practice 
fixed #2793:best practice of New Label
 2013-09-12 22:29:56 -07:00
minggo c4cb2582cc fixed #2793:best practice of New Label 2013-09-13 11:46:46 +08:00
samuele3hu 3a334b7478 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into doxygen 2013-09-13 11:42:04 +08:00
samuele3hu a34ec99014 issue #2784:Add js-binding and lua-binding document 2013-09-13 11:41:20 +08:00
James Chen cb7d090992 [dispatcher] Updating CCDevice.cpp for linux. 2013-09-12 21:39:47 +08:00
James Chen 57b0a66bda [dispatcher] Removing Layer::setTouchPriority since it's not needed. 2013-09-12 21:11:47 +08:00
James Chen 1702cbd7b2 [dispatcher] Other platforms update. 2013-09-12 20:56:57 +08:00
James Chen dd57d6321b [dispatcher] Updating Makefile. 2013-09-12 20:51:44 +08:00
James Chen 6f37529236 [dispatcher] Adding 'Node::updateEventPriorityIndex' and making 'Node::addEventId(removeEventId)' method to be private. 2013-09-12 20:47:15 +08:00
James Chen 06bc92ff19 [dispatcher] Removing unused listeners after dispatching event. 2013-09-12 20:45:35 +08:00
James Chen fb12c90238 [dispatcher] Using temporary std::vector in handleTouchXXXX. 2013-09-12 20:43:09 +08:00
James Chen ea74c30895 [Dispatcher] Updating ios/CCDevice.mm. 2013-09-12 20:41:59 +08:00