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

4808 Commits

Author SHA1 Message Date
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
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 2fd655dc57 [dispatcher] Using cocos2d-x memory model instead of std::shared_ptr. It should be unified. 2013-09-13 18:00:56 +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
James Chen 24c8438fa6 [Dispatcher] Updating Android.mk, and some refractor. 2013-09-12 17:31:37 +08:00
James Chen f6faf58f2e [Dispatcher] Updating Log message in CCAccelerationEventListener.cpp. 2013-09-12 16:03:30 +08:00
James Chen 891bcba459 [Dispatcher] Reverting Touch, it should be inherited from Object for JSB. 2013-09-12 16:01:49 +08:00
James Chen 1c7287dd59 [Dispatcher] Updating license of CCEventListener.cpp. 2013-09-12 16:01:14 +08:00
James Chen 6623879f6d [EventDispatcher] Refactoring Touch, Touch doesn't inherit from Object now. Using std::vector<Touch*> to dispatch event and a little performance improved. 2013-09-12 14:26:39 +08:00
James Chen 7071240e30 [EventDispatcher] Remove unused file(CCTouchDispatcher) reference in CCEGLView.mm. 2013-09-12 14:24:30 +08:00
Siim Kallas 4e1e69e873 Fixed compilation on VC12 (VS2013 RC), std::min and std::max require <algorithm> 2013-09-11 19:00:48 +03:00
James Chen b798535f14 [win32] Removing CCAccelerometer.cpp. 2013-09-11 22:31:17 +08:00
James Chen da1101beeb [Dispatcher] New event dispatcher, first commit. 2013-09-11 22:09:34 +08:00
chengstory 669de88e73 1. remove any unused functions. 2013-09-10 11:02:50 +08:00
minggo c5b113c35e Merge pull request #3554 from ricardoquesada/fileutils_perf_improvements 
Fileutils perf improvements
 2013-09-08 19:50:12 -07:00
James Chen b8c82ae5a9 [develop] Warning fixes. 2013-09-08 11:26:38 +08:00
Ricardo Quesada 487f65af2e Replaces `Dictionary` with `std::unordered_map` 
I did some performance tests, and `std::unordered_map` is more performant than `Dictionary`.

I need to do more tests, but so far, the results are good.

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-09-06 22:55:11 -07:00
Ricardo Quesada 7d8261c722 Optimization + standardization in FileUtils 
Since `FileUtils` was using `std::string` internally, it is more efficient to accept `const std::string &` as parameter than `char *` to avoid the creation of unneeded strings.

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-09-06 22:54:08 -07:00
Ricardo Quesada 028deae846 Adds const in FileUtils 
`const` was missing in some getters

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-09-06 22:52:55 -07:00
Ricardo Quesada 2d2e15d275 Key should start with '/' to gain performance 
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-09-06 22:51:47 -07:00
Ricardo Quesada 3a0e957e9e compatible with cocos2d c++ guidelines 2013-09-06 19:02:24 -07:00
Ricardo Quesada bf6750067f little optimization. 
string is created when needed
 2013-09-06 19:00:12 -07:00
Ricardo Quesada b2a81b5b86 Removes some Hungarion notation... 
...and improves performance in FileUtils: String is not created
 2013-09-06 18:46:33 -07:00
Ricardo Quesada ef622b23bd lazy alloc component container 
faster and less memory
 2013-09-06 16:00:24 -07:00
Ricardo Quesada b78382d5e5 Performance improvements in FileUtils / TextureCache 
Added common "apple" platform to avoid duplicate files in FileUtils and other common files
Improves performance in fetching files.
 2013-09-06 15:33:28 -07:00
minggo 249b4d79a3 Merge pull request #3503 from dabingnn/Iss2460-glfw-refractor 
Iss2460 glfw refractor
 2013-09-05 18:28:31 -07:00
samuele3hu 32d056df18 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TableView 2013-09-04 14:03:21 +08:00
samuele3hu 6815e01f84 issue #2764:Add TableView lua binding and releated test sample 2013-09-04 14:02:22 +08:00
minggo 9dedb072e6 Merge pull request #3528 from natural-law/ForPlugin 
Modify the method cocos_android_app_init()
 2013-09-03 22:50:40 -07:00
Ricardo Quesada ee638b9c8b removes 'private' section from SpriteBatchNode 2013-09-02 16:56:14 -07:00