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

74 Commits

Author SHA1 Message Date
James Chen c754e1b64f Merge pull request #4035 from darkdukey/mousewheel_mac 
issue #3099: Adding MouseEvent and MouseListener, Adding Mouse Support For Desktop Platform.
 2013-11-01 02:33:28 -07:00
James Chen ed10b92a60 Fix of including wrong include files. 2013-11-01 15:19:10 +08:00
minggo f684dc0ff7 Merge pull request #4025 from Dhilan007/di2893 
issues #2893:perfect new label
 2013-10-31 18:46:30 -07:00
minggo 0a9755bcc4 Merge pull request #4037 from samuele3hu/developLabelTTF 
issue #2970:crash for CCLabelTTF when setting dimension width less than the font height
 2013-10-31 18:45:42 -07:00
Ricardo Quesada 17af5b6850 Adds flags in GLProgram to prevent sending uneeded uniforms 2013-10-31 17:56:15 -07:00
Dhilan007 150f1aeaab issue #2893:improve new label 2013-10-31 20:17:30 +08:00
Dhilan007 b8faaeba59 issus #2893:improve new label 2013-10-31 17:52:22 +08:00
samuelhu 15cf519757 issue #2970:crash for CCLabelTTF when setting dimension width less than the font height 2013-10-31 16:59:55 +08:00
Nite Luo 771844fc58 Fix android build after adding MouseEvent and MouseTest 2013-10-31 00:40:38 -07:00
Nite Luo a27975763f Add MouseEvent to win32 build 2013-10-31 00:04:39 -07:00
Nite Luo fe04448c8d Merge folder changes from develop 2013-10-30 23:19:36 -07:00
Dhilan007 12db6a32ab issues #2893: 
1.Texture atlas are create on demand, based on the characters used in the label.
  2.Create Quads (and not sprites) for each letter.
 2013-10-31 10:49:37 +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 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 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
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
minggo abcf8f268d fix conflicts 2013-10-22 18:36:13 +08:00