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

11907 Commits

Author SHA1 Message Date
James Chen 37dd173644 issue #2087: [dispatcher] Fixing errors in test. 2013-09-16 16:03:39 +08:00
James Chen 8e668cd837 issue #2087: [dispatcher] Rename FixedPriorityChangedTest to FixedPriorityTest. 2013-09-16 16:02:48 +08:00
James Chen 46e1291ce1 issue #2087: [dispatcher] Enabled touch for Box2dTestBed, removed touch listener before re-adding. 2013-09-16 15:55:03 +08:00
James Chen 990b801b11 issue #2087: [dispatcher] Reverts: glGetError --> CHECK_GL_ERROR_DEBUG. 2013-09-16 15:54:02 +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
James Chen 7921b45090 issue #2087: [dispatcher] New Dispatcher Test: Fixed priority. Adding include. 2013-09-16 15:43:48 +08:00
James Chen b3cade3be0 issue #2087: [dispatcher] New Dispatcher Test: Fixed priority. 2013-09-16 15:43:20 +08: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
James Chen e31c4f008d Merge pull request #3597 from chengstory/#4560 
SceneEditorTest He version
 2013-09-15 20:23:05 -07:00
James Chen 79da678acb Merge pull request #3608 from CocosRobot/updategeneratedsubmodule_1379301556 
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
 2013-09-15 20:21:06 -07:00
CocosRobot f01fb83e26 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-09-16 03:19:19 +00: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
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
minggo 37cfc855b9 Merge pull request #3581 from dabingnn/new_shader_test 
issue #2782: add shader test sprite and close issue
 2013-09-15 19:36:51 -07:00
Huabing.Xu 20fde2bcde issue #2808:glfw linux scripts 2013-09-16 10:11:46 +08:00
minggo 2e6901906d Merge pull request #3602 from samuele3hu/Bridge 
issue:Add LuaJavaBridge
 2013-09-15 19:10:56 -07:00
samuele3hu 6efe3e7eeb issue #2794:Add a newline 2013-09-16 10:04:58 +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 9891077bba [dispatcher] Adding 'emit touch event' menu item. 2013-09-15 21:56:02 +08:00
James Chen e3cce1fd0b [dispatcher] 100 times for Touch event dispatch test. 2013-09-15 18:26:17 +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 62a0dc41c3 [dispatcher] Adding TouchEvent dispatch test. 2013-09-15 17:49:36 +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
zhangcheng e4d8113d43 1. remove "\\" to "/". 2013-09-15 17:33:58 +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
zhangcheng 841ea4cfdd 1. change 480*320 to 960*640. 2013-09-14 20:52:35 +08:00
zhangcheng 95236e86d9 1. update scenetest version. 2013-09-14 20:49:02 +08:00
samuele3hu 85ca0136f0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Bridge 2013-09-14 19:53:08 +08:00
zhangcheng acf9754814 1. add supported for 480*320 on scenetest. 2013-09-14 19:03:15 +08:00
zhangcheng 0121943c11 1. Adds SceneEditorTest hd version 2013-09-14 16:34:26 +08:00
James Chen 1ed980d27c [dispatcher] Updating win32 TestCpp.vcxproj. 2013-09-14 10:32:37 +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
James Chen 6b0d365d91 Merge pull request #3593 from CocosRobot/updategeneratedsubmodule_1379068245 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-09-13 03:53:35 -07:00
James Chen dd55822465 [dispatcher] Updating NewEventDispatcherTest.cpp. 2013-09-13 18:51:00 +08:00
minggo 438d041167 Merge pull request #3592 from Dhilan007/develop 
Add icon for IOS 7.
 2013-09-13 03:43:20 -07:00
CocosRobot 585f3b081e [AUTO] : updating submodule reference to latest autogenerated bindings 2013-09-13 10:30:50 +00:00
minggo 4dac164ec8 Merge pull request #3591 from samuele3hu/doxygen 
issue #2784:Add js-binding and lua-binding document
 2013-09-13 03:24:07 -07: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 ff24eac21a [dispatcher] Adding new EventDispatcher Test to Makefile and project. 2013-09-13 18:08:00 +08:00
James Chen cf66992b51 [dispatcher] Updating HelloWorldScene.cpp, if you wish to using the same listener for different target, please invoke clone to create a new one. 2013-09-13 18:02:26 +08:00
James Chen 7729756d04 [dispatcher] Updating EventDispatcherTest.cpp. 2013-09-13 18:01:32 +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