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

12733 Commits

Author SHA1 Message Date
boyu0 dec749a692 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-10-31 18:20:32 +08:00
boyu0 2efef34144 issue #2771: fix vs compile errors 2013-10-31 18:18:02 +08:00
James Chen ca4c181e4a Merge pull request #4036 from dumganhar/develop 
closed #3093: [JSB] The last test of OpenglTest crashes on Windows.
 2013-10-31 01:43:55 -07:00
James Chen 4b2429186c closed #3093: The last test of OpenglTest crashes on Windows. 2013-10-31 16:27:00 +08:00
minggo 2c2cdd08dc Merge pull request #4034 from samuele3hu/developLuaOcBridge 
issue #2794:Add LuaObjectCBridge and related test sample
 2013-10-31 01:14:59 -07:00
samuelhu 705da20ee7 issue #2794:Add LuaObjectCBridge and related test sample 2013-10-31 15:26:38 +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
James Chen 77de0b580a Merge pull request #4033 from dingpinglv/Iss3048_cc.rect 
Closed #3048: cc.rect can receiving different type parameters now
 2013-10-30 23:52:48 -07: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
James Chen bacf07643a Merge pull request #4032 from Dhilan007/vs-config 
perfect vs-project configuration
 2013-10-30 19:54:40 -07:00
Dhilan007 a68d92ff5a perfect vs-project configuration 2013-10-31 10:51:38 +08:00
James Chen 7bd9cc28ea Merge pull request #4031 from samuele3hu/developTouchEvent 
issue #3069:Modify layer lua register and add some compatible lua binding functions
 2013-10-30 18:59:44 -07:00
samuelhu 53b0bfc27b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTouchEvent 2013-10-31 09:52:01 +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
minggo 5d931dab64 Update CHANGELOG 2013-10-30 18:31:59 +08:00
minggo 9e5420c954 Merge pull request #4029 from minggo/iss2905-adjust_folder 
use build/android-build to build android samples, and update readme
 2013-10-30 03:30:03 -07:00
minggo da9f7c912b use build/android-build to build android samples, and update readme 2013-10-30 18:27:56 +08:00
boyu0 e8d06496d0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-10-30 17:27:09 +08:00
boyu0 391cda44ef issue #2771: edit listener 2013-10-30 15:53:58 +08:00
minggo 93cde4d814 Merge pull request #4027 from minggo/iss2905-adjust_folder 
add script to build android samples
 2013-10-29 23:22:26 -07:00
minggo 4d9b05a67d add script to build android samples 2013-10-30 14:19:07 +08:00
boyu0 cae9a3e54f issue #2771: add physics pump demo and fix bugs 2013-10-29 17:31:35 +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 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
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