samuelhu
c08a09a7e0
#3049:Add LICENSE_JSON4LUA and some constant values.
2013-10-30 10:52:04 +08:00
yinkaile
ef973b5737
upload resource
2013-10-30 09:54:05 +08:00
yinkaile
8fa8b9f844
update develop
2013-10-30 09:41:40 +08:00
lite3
2e3b3be125
config android_mk_generator
2013-10-29 22:53:01 +08:00
samuelhu
471bbb8af9
issue #3049:Add XMLHttpRequest lua binding and corresponding test sample
2013-10-29 18:21:15 +08:00
samuelhu
663b27d1e7
#3049:Add XMLHttpRequest lua binding and corresponding test sample
2013-10-29 18:06:02 +08:00
samuelhu
b611177a65
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp
2013-10-29 17:58:00 +08:00
samuelhu
70082ddc29
issue #3409:Add XMLHttpRequest lua binding and corresponding test sample
2013-10-29 17:54:35 +08:00
boyu0
cae9a3e54f
issue #2771 : add physics pump demo and fix bugs
2013-10-29 17:31:35 +08:00
yinkaile
2d3df69982
fix add display
2013-10-29 16:57:06 +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
yinkaile
dfc40d354e
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop
...
Conflicts:
extensions/CocoStudio/Armature/CCArmature.cpp
extensions/CocoStudio/Armature/CCBone.cpp
extensions/CocoStudio/Armature/CCBone.h
extensions/CocoStudio/Armature/display/CCDisplayManager.cpp
extensions/CocoStudio/Armature/display/CCSkin.cpp
extensions/CocoStudio/Armature/utils/CCDataReaderHelper.cpp
2013-10-29 16:18:00 +08:00
yinkaile
e524c3de5c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
...
Conflicts:
extensions/Android.mk
2013-10-29 16:13:35 +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
cb7a762584
issue #3069 : Updating EventDispatcherTest.
2013-10-29 14:59:05 +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
samuelhu
3508213615
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2013-10-29 11:45:19 +08:00
samuelhu
a4d028e905
issue #3409:Add XMLHttpRequest lua binding and corresponding test sample
2013-10-29 11:40:41 +08:00
minggo
df3ebf8451
Update CHANGELOG
2013-10-29 10:07:43 +08:00
minggo
d4995a8c9c
Update AUTHORS
2013-10-29 10:06:32 +08:00
minggo
3f195c86bd
Merge pull request #4020 from michaelcontento/android_supports_screens
...
Android: add xlargeScreens="true" to supports-screens
2013-10-28 19:04:37 -07:00
minggo
f2c229c722
Update CHANGELOG
2013-10-29 09:05:04 +08:00
minggo
d11854c111
Update AUTHORS
2013-10-29 09:04:11 +08:00
minggo
6d5f7beda7
Merge pull request #4019 from superrad/patch-1
...
Clear NoSuchMethodError Exception when JniHelper fails to find methodID
2013-10-28 18:02:47 -07:00
Michael Contento
fe180078f0
Android: add xlargeScreens="true" to supports-screens
2013-10-28 23:12:51 +01: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
boyu0
66d1bbd89f
issue #2771 : edit physics effect with all bodies and fix some bugs
2013-10-28 16:17:19 +08:00
James Chen
a829325240
issue #3069 : Updating EventDispatcherTest.
2013-10-28 16:00:19 +08:00
James Chen
8b7d1934c8
issue #3069 : Using enum class for define Event type and EventListener type.
2013-10-28 16:00:01 +08:00
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
e6b0134080
issue #3069 : Updating Custom event test.
2013-10-28 10:49:43 +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
psi
027f663776
Merge branch 'fix_inclusion_phys'
2013-10-26 13:34:08 +09:00
psi
9ecc0c6db8
include climits for UINT_MAX
2013-10-26 13:33:31 +09: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
262b54eef2
issue #3069 : Updating ScrollView.
2013-10-25 16:06:52 +08:00
James Chen
312e1bd27c
[Dispatcher] Updating comments.
2013-10-25 15:40:21 +08:00