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

12723 Commits

Author SHA1 Message Date
James Chen 69b0206018 issue #2826: Updating vs project to link mozjs-25.lib 2013-10-31 11:24:43 +08:00
James Chen 0f7a99f898 [sp v25] Don't use 'using namespace std;' to make android build happy. 2013-10-31 11:15:18 +08:00
James Chen 541a0478ac [sp v25] Removing unused comments in main.js 2013-10-31 11:15:18 +08:00
James Chen d2fc29dbfa [sp v25] Updating Debugger script. 2013-10-31 11:15:17 +08:00
James Chen a81998ccf6 [sp v25] Debugger script, loading file is ok. 2013-10-31 11:15:17 +08:00
James Chen d1b88b0a78 [sp v25] Updating auto-generated and bindings-generated submodules. 2013-10-31 11:15:17 +08:00
James Chen 3b86d6398f [sp v25] Fixing complication errors after updating Spidermonkey to v25. 2013-10-31 11:15:17 +08:00
James Chen 379bcb194c [sp v25] Updating SpiderMonkey library to FFv25. 2013-10-31 11:15:16 +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
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
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
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
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
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