boyu0
|
d0d8694091
|
issue #2771: fix some retain/release bugs
|
2013-10-28 11:08:41 +08:00 |
James Chen
|
8d11f484a9
|
issue #3069: Removing unused comments.
|
2013-10-28 10:52:23 +08:00 |
James Chen
|
0622434321
|
issue #3069: Using `std::string` to initialize `EventCustom`. It will be easier for editor parser to emit callback event.
|
2013-10-28 10:49:21 +08:00 |
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
|
0d2d522f12
|
issue #3069: int --> EventListener::Type.
|
2013-10-25 16:15:37 +08:00 |
James Chen
|
312e1bd27c
|
[Dispatcher] Updating comments.
|
2013-10-25 15:40:21 +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
|
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
|
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 |
samuelhu
|
a5e479d2bb
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
|
2013-10-24 11:14:20 +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 |
Dhilan007
|
dfd69d262a
|
adjust std:function support 10 parameter
|
2013-10-23 16:48:51 +08:00 |
ondesly
|
969b464b9b
|
android & ios screen size change support
|
2013-10-23 12:29:59 +04:00 |
samuelhu
|
26caaa0a36
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
|
2013-10-23 09:57:21 +08:00 |
minggo
|
abcf8f268d
|
fix conflicts
|
2013-10-22 18:36:13 +08:00 |
minggo
|
6a664d480a
|
issue #2905:samples build ok on linux
|
2013-10-22 18:01:56 +08:00 |
samuelhu
|
5f769b2313
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
|
2013-10-22 16:52:44 +08:00 |
samuelhu
|
be1f17ca0f
|
issue #3037:Add assetsmananger lua binding and a releated test sample
|
2013-10-22 16:14:49 +08:00 |
minggo
|
d968ef6949
|
Merge pull request #3990 from Dhilan007/di2905
issues #2905:add miss file
|
2013-10-22 00:58:34 -07:00 |
Dhilan007
|
31a2217178
|
issues #2905:add miss file
|
2013-10-22 15:56:08 +08:00 |
minggo
|
d07fbb8903
|
Merge pull request #3974 from boyu0/iss2771_physical
issue 2771: physical
|
2013-10-21 22:44:22 -07:00 |
Dhilan007
|
f11dba586a
|
issue #2905:modification vs-project for folder structure change
|
2013-10-21 22:09:21 +08:00 |
boyu0
|
6e2c4801f8
|
Merge https://github.com/cocos2d/cocos2d-x into iss2771_physical
|
2013-10-18 16:05:29 +08:00 |
Dhilan007
|
6ce34288e0
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-10-18 15:53:26 +08:00 |
minggo
|
5f65cdc3c0
|
fix xcode compiling error and simplify android.mk
|
2013-10-18 15:39:09 +08:00 |
boyu0
|
d12ee5f120
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
|
2013-10-18 15:34:13 +08:00 |
Dhilan007
|
6f39f903e3
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-10-17 16:23:19 +08:00 |
James Chen
|
fd0e84bfa2
|
Merge pull request #3963 from kpkhxlgy0/use
closed #2994: Can't click the area that outside of keyboard to close keyboard when using EditBox
|
2013-10-17 00:36:33 -07:00 |
minggo
|
e50f9fc43b
|
issue #2905: jsbinding samples and lua binding samples build ok on android
|
2013-10-17 15:04:30 +08:00 |
XiaoLongHan
|
a2de02cc19
|
Change the class name of textfield to compare, so that you can touch anywhere outside of the virtual keyboard.
|
2013-10-17 14:21:55 +08:00 |
Dhilan007
|
c6344875de
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-10-16 17:30:51 +08:00 |
minggo
|
8f7a489a4d
|
issue #2905:make cocostudio and gui flat
|
2013-10-16 16:48:39 +08:00 |
Dhilan007
|
5116e91c4b
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into di2905
|
2013-10-16 11:00:22 +08:00 |
minggo
|
410280a8d3
|
Merge pull request #3945 from minggo/iss2905-adjust_folder
issue #2905: testcpp bild ok on Android
|
2013-10-15 03:02:12 -07:00 |
minggo
|
6fc2be62f5
|
issue #2905: testcpp bild ok on Android
|
2013-10-15 18:00:03 +08:00 |
Dhilan007
|
2865ad798b
|
issues #2905:Updating project configuration for folder change.
|
2013-10-15 10:18:37 +08:00 |
James Chen
|
438fe70287
|
issue #2905: [iOS, Mac] HelloCpp works now.
|
2013-10-14 15:53:14 +08:00 |
minggo
|
92e0dbe0c1
|
issue #2905:add ccUtils.cpp
|
2013-10-14 14:56:57 +08:00 |
minggo
|
95acb1b9e3
|
issue #2905: helloworld build ok on android
|
2013-10-14 14:01:00 +08:00 |
minggo
|
49d7bbd600
|
issue #2905: remove sub folders except platform
|
2013-10-12 15:41:45 +08:00 |
minggo
|
4313c46e93
|
issue #2905:adjust folder structure
|
2013-10-12 11:22:05 +08:00 |