samuelhu
7c45ddafe2
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2013-10-31 17:22:14 +08:00
James Chen
4b2429186c
closed #3093 : The last test of OpenglTest crashes on Windows.
2013-10-31 16:27:00 +08:00
samuelhu
de4b4dcc73
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developLuaOcBridge
2013-10-31 15:23:25 +08:00
samuelhu
faf3b30e9b
issue #3069:Add LuaObjectCBridge and related test sample
2013-10-31 15:20:53 +08:00
dingpinglv
7e8faed7af
fixed #3048 : rename some comments
2013-10-31 14:36:17 +08:00
dingpinglv
f172abbc14
fixed #3048 : add some comments for cc.rect
2013-10-31 14:31:25 +08:00
dingpinglv
c116d070d3
Closed #3048 : cc.rect can receiving different type parameters now
2013-10-31 14:16:42 +08:00
Dhilan007
a68d92ff5a
perfect vs-project configuration
2013-10-31 10:51:38 +08:00
samuelhu
1f07a659a6
issue #3069:Modify layer lua register and add some compatible lua binding functions
2013-10-31 09:49:04 +08:00
James Chen
5c8424423e
issue #3069 : Update ios/CCDevice.mm.
2013-10-29 16:29:29 +08:00
James Chen
e2ce714463
issue #3069 : Update device.mm for iOS.
2013-10-29 16:20:42 +08:00
James Chen
ca598f29eb
Merge pull request #4008 from dumganhar/touchevent-refactor
...
issue #3069 : Refactor and Improve EventDispatcher
2013-10-29 00:46:56 -07:00
James Chen
91932ea906
issue #3069 : Fixing compilation errors.
2013-10-29 15:36:43 +08:00
James Chen
bb568e84e8
Updating auto generated binding codes.
2013-10-29 15:09:13 +08:00
James Chen
fbd04a476a
issue #3069 : Updating comments in CCEventListenerCustom.h.
2013-10-29 15:02:26 +08:00
James Chen
01579e12b0
issue #3069 : Remove unused ID.
2013-10-29 15:01:39 +08:00
James Chen
5698dcd0e1
issue #3069 : Protecting some methods in EventListener, make EventDispatcher as its friend class.
2013-10-29 14:58:47 +08:00
James Chen
296978a9be
issue #3069 : Separate 'EventDispatcher::removeEventListeners' to 'removeEventListeners' and 'removeCustomEventListeners'.
2013-10-29 14:57:16 +08:00
Andrew Glass
06bd7fafd5
Clear NoSuchMethodError Exception when JniHelper fails to find methodID
...
When calling GetMethodID a NoSuchMethodError will be raised if the method cannot be found.
See http://docs.oracle.com/javase/7/docs/technotes/guides/jni/spec/functions.html#wp16660
This exception should be cleared if JNI execution is to be continued.
Currently JniHelper informs that the method is not found, but there is no way to continue execution without manually clearing the exception. This prevents checking for the existence of a method and recovering from it being missing.
This fix will clear the exception if JniHelper fails to find the method.
2013-10-28 18:40:58 +00:00
James Chen
8b7d1934c8
issue #3069 : Using enum class for define Event type and EventListener type.
2013-10-28 16:00:01 +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
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
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
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
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
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
Dhilan007
fd993e2fa2
issues #2905:split jsbinding module
2013-10-24 17:54:57 +08:00