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

4931 Commits

Author SHA1 Message Date
minggo f895183fbc add renamed files into vs.proj 2013-09-21 15:01:42 +08:00
minggo 261f0e4f05 rename some files 2013-09-21 14:40:54 +08:00
minggo bcb171e3c9 fix line end in windows 2013-09-20 22:23:13 +08:00
minggo be7d59b132 fix typo error 2013-09-20 21:29:12 +08:00
minggo 4c9771ba3c rename some class names to obey cocos2d-x coding style 2013-09-20 19:19:31 +08:00
James Chen c22315a19c Don't set listener type to "" when dissociateEventListener. 2013-09-20 14:36:15 +08:00
James Chen db2706553e Fixing dangerous pointer when removing event listener. 2013-09-20 14:13:20 +08:00
James Chen 213be32932 issue #2087: Fixing potential crash reported by Sam Gross. Thanks @Sam. 2013-09-20 10:23:58 +08:00
Dhilan007 2504b8e029 restore AccelerometerTest 2013-09-19 19:05:52 +08:00
James Chen 7797fad5a5 issue #2087: [EventDispatcher] Fixing crash on Win32. 2013-09-19 10:19:02 +08:00
James Chen ebedd7b59e issue #2087: Adding customevent and CustomEventListener to VS project. 2013-09-19 09:25:43 +08:00
James Chen e051903b38 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2087-new-event-dispatcher 2013-09-19 09:22:31 +08:00
James Chen 3fbf61ad52 issue #2087: Adding CustomEvent and CustomEventListener classes. Make Event and EventListener as abstract classes. 2013-09-19 09:14:51 +08:00
James Chen 5570b6089a Merge pull request #3703 from dumganhar/iss2087-new-event-dispatcher 
Fixing crash of ACC-Test.[ci skip]
 2013-09-18 17:21:48 -07:00
James Chen a842b6de2f Merge pull request #3699 from Dhilan007/develop 
Unify Accelerometer coordinate on IOS and Android.[ci skip]
 2013-09-18 17:20:38 -07:00
James Chen 40258ede68 Fixing crash of ACC-Test. 2013-09-19 08:12:54 +08:00
Ricardo Quesada e9237e1aad version is v3.0-alpha0 2013-09-18 16:56:25 -07:00
Dhilan007 479355ee32 Unify Accelerometer coordinate on IOS and Android. 2013-09-19 00:04:50 +08:00
minggo a901efb603 make Director::end() reantrant 2013-09-18 23:52:09 +08:00
James Chen 3985574c30 issue #2087: Bug fix in EventDispatcher: _isRegister fix. 2013-09-18 22:21:22 +08:00
James Chen 8fa969b39e issue #2087: Init Event::_userData. 2013-09-18 22:20:20 +08:00
James Chen a2d9f2d7cf Make XXXEventListener as friend class of XXXEvent. Move the test of eventdispatchertest. 2013-09-18 18:35:42 +08:00
James Chen e697b0fc0b issue #2087: Updating the constructor of XXXEvent. 2013-09-18 18:16:14 +08:00
James Chen 6f53dcb49f issue #2087: Adding Event::setUserData and Event::getUserData, making some methods inline. 2013-09-18 18:15:18 +08:00
James Chen d7f15a971a Merge pull request #3692 from dumganhar/iss2087-new-event-dispatcher 
issue #2087: Sorts listeners only when flag is dirty. setPriority is only valid in fixed priority listener.
 2013-09-18 02:49:52 -07:00
James Chen f7fa92aea9 issue #2087: Sorts listeners only when flag is dirty. setPriority is only valid in fixed priority listener. 2013-09-18 17:46:00 +08:00
minggo ff3fcf5eb7 Merge pull request #3690 from dabingnn/release30_bug_hot_fix 
glfw EGLView alloc on the stack to prevent memory leak
 2013-09-18 02:44:34 -07:00
Huabing.Xu 768828ec29 add term logic of application to prevent memory leak (for desktop such as linux, mac, windows) 2013-09-18 17:16:31 +08:00
samuele3hu 71b03ecdb9 replace tabs with spaces 2013-09-18 17:09:08 +08:00
samuele3hu 1ee7f72276 Modify handle_key_input function for responding the onKeyReleased 2013-09-18 17:02:32 +08:00
James Chen 5a65ef7488 Merge pull request #3686 from dumganhar/iss2087-new-event-dispatcher 
Fixing crash after changing Dictionary::createWithContentOfFile() to return autorelease object. [ci skip].
 2013-09-18 01:05:11 -07:00
James Chen cfb5de2900 Fixing crash after changing Dictionary::createWithContentOfFile() to return autorelease object. [ci skip]. 2013-09-18 16:06:39 +08:00
James Chen 40a6f84585 Merge pull request #3680 from Dhilan007/develop 
1.android platform:handle key event and fix Accelerometer value error [ci skip]
 2013-09-18 00:01:32 -07:00
James Chen d66420586c Fix a memory leak in Dictionary::createWithContentOfFile(). 2013-09-18 14:09:02 +08:00
James Chen 241c0c8efc issue #2087: Small improvement in Node::removeAllEventListeners. Adding Node::_oldEventPriority property. 2013-09-18 13:01:53 +08:00
James Chen 3a5a1e6604 issue #2087: Invokes EventDispatcher::destroyInstance() when purging Director. 2013-09-18 13:00:43 +08:00
James Chen 80d1c315b3 issue #2087: Modify singleton implement for EventDispatcher, adding EventDispatcher::destroyInstance(). 2013-09-18 13:00:08 +08:00
Dhilan007 fd3a03a6ee 1.android platform:handle key event 
2.android platform:fix Accelerometer value error
 2013-09-18 12:04:35 +08:00
minggo 75d31b3c5c Merge pull request #3603 from ktaobo/disable-nslog 
Disable log output on release build
 2013-09-17 18:37:09 -07:00
minggo b91b350f2b Merge pull request #3666 from Dhilan007/develop 
android platform:fix EditBox not show input box and crash.
 2013-09-17 18:33:43 -07:00
James Chen f403f7d683 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into keyboard_test 
Conflicts:
	samples/samples.xcodeproj/project.pbxproj
 2013-09-17 23:24:14 +08:00
Dhilan007 a3524f420d . 2013-09-17 23:22:16 +08:00
James Chen e563c27994 Keypad event fix for js and lua bindings. 2013-09-17 23:21:45 +08:00
Dhilan007 509bea531a android platform:fix EditBox not show input box and crash. 2013-09-17 23:16:32 +08:00
James Chen aaf4a6a81b [win32] clear keycode map before init eglview. 2013-09-17 22:37:16 +08:00
minggo b1c8871208 linux build ok 2013-09-17 22:36:15 +08:00
James Chen 7d94878173 [win32] glfw keyboard callback is enabled now. Enables KeyboardTest for win32. 2013-09-17 22:34:20 +08:00
minggo ddaff9cce6 make cocos2dx depend chipmunk 2013-09-17 19:24:30 +08:00
minggo d488796896 Merge branch 'iss2771_physical' of https://github.com/boyu0/cocos2d-x into merge-physics 2013-09-17 18:14:12 +08:00
boyu0 a454e373c7 issue #2771: move include chipmunk and box2d to cpp 2013-09-17 17:39:08 +08:00