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

12268 Commits

Author SHA1 Message Date
James Chen 4ba6924110 Merge pull request #3712 from dumganhar/register-touch 
Making cc.registerTargetDelegate and cc.registerStandardDelegate compatible with Cocos2d-html5.
 2013-09-19 08:42:16 -07:00
James Chen a460f44a1a Making cc.registerTargetDelegate and cc.registerStandardDelegate compatible with Cocos2d-html5. 2013-09-19 23:43:41 +08:00
James Chen dadf6b3d0b Merge pull request #3710 from Dhilan007/develop 
restore AccelerometerTest
 2013-09-19 07:20:23 -07:00
James Chen 2ebdb440bf Merge pull request #3706 from ricardoquesada/cpp_best_practices 
Small fixes to comply with C++ best practices
 2013-09-19 07:15:32 -07:00
Dhilan007 2504b8e029 restore AccelerometerTest 2013-09-19 19:05:52 +08:00
James Chen 07f5ad445c Merge pull request #3709 from dumganhar/iss2087-new-event-dispatcher 
Fixing SchedulerTest crash. We need to invoke parent's onExit in subclass::onExit.
 2013-09-19 03:54:44 -07:00
James Chen 153794ba6c Updating MutiTouchTest.cpp. Adding title. Removing unused codes. 2013-09-19 18:54:26 +08:00
James Chen d32fb93e07 Fixing SchedulerTest crash. We need to invoke parent's onExit in subclass::onExit. 2013-09-19 18:53:45 +08:00
James Chen b05796e1a5 issue #2087: Fixing NewEventDispatcherTest --> SpriteAccelerationEventTest crash. 2013-09-19 13:55:49 +08:00
James Chen 302bdbbe8f Merge pull request #3708 from dumganhar/iss2087-new-event-dispatcher 
issue #2087: Fixing NewEventDispatcherTest --> SpriteAccelerationEventTest crash.
 2013-09-18 22:55:41 -07:00
Ricardo Quesada 0674948325 Small fixes to comply with C++ best practices 
Small fixes to comply with C++ best practices
 2013-09-18 19:38:21 -07:00
James Chen 4b3b69bb6b Merge pull request #3705 from dumganhar/iss2087-new-event-dispatcher 
issue #2087: [EventDispatcher] Fixing crash on Win32.
 2013-09-18 19:17:51 -07:00
James Chen 7797fad5a5 issue #2087: [EventDispatcher] Fixing crash on Win32. 2013-09-19 10:19:02 +08:00
James Chen e201cff032 Merge pull request #3704 from dumganhar/iss2087-new-event-dispatcher 
issue #2087: Adding CustomEvent and CustomEventListener and bug fix for CCInputDelegate in Extension.[ci skip]
 2013-09-18 18:49:31 -07:00
James Chen f78634617c Merge branch 'iss2087-new-event-dispatcher' of z:/Project/cocos2d-x into iss2087-new-event-dispatcher 2013-09-19 09:26:11 +08:00
James Chen ebedd7b59e issue #2087: Adding customevent and CustomEventListener to VS project. 2013-09-19 09:25:43 +08:00
James Chen c38dfb6a17 issue #2087: Setting default touch priority to -1 for CCInputDelegate 2013-09-19 09:24:11 +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 d7274b9475 issue #2087: Should not use fixed priority with 0 value, it's for scene graph based priority. 2013-09-19 09:19:03 +08:00
James Chen db98d662af issue #2087: Fixing crash of ComponentTest. 2013-09-19 09:15:56 +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 0d17ef1e95 Merge pull request #3701 from ricardoquesada/xcode_template_fixes 
Small fixes for Xcode templates[ci skip]
 2013-09-18 17:14:36 -07:00
James Chen 10683a3910 Merge pull request #3702 from ricardoquesada/update_cocos2d_version 
version is v3.0-alpha0[ci skip]
 2013-09-18 17:13:29 -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
Ricardo Quesada 24df87265e Small fixes for Xcode templates 
Also, uses `auto` in the template code to be more c++11 friendly
 2013-09-18 16:50:26 -07:00
Dhilan007 479355ee32 Unify Accelerometer coordinate on IOS and Android. 2013-09-19 00:04:50 +08:00
minggo fa71f8f479 Merge pull request #3698 from minggo/develop 
make Director::end() reantrant
 2013-09-18 08:58:44 -07:00
minggo a901efb603 make Director::end() reantrant 2013-09-18 23:52:09 +08:00
James Chen ec7cfae4e8 Merge pull request #3697 from dumganhar/iss2087-new-event-dispatcher 
Fixing MenuTest crash.
 2013-09-18 08:42:09 -07:00
James Chen c7612fee15 Fixing MenuTest crash. 2013-09-18 23:43:04 +08:00
Dhilan007 ba47e666c1 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-09-18 23:03:23 +08:00
James Chen 339b4fa749 Merge pull request #3696 from dumganhar/iss2087-new-event-dispatcher 
issue #2087: Adding  new event dispatcher test and bug fixes.
 2013-09-18 07:51:12 -07:00
James Chen 4288160d50 issue #2087: Renaming EventDispatcherTest name to EventDispatcherTest(NEW) 2013-09-18 22:47:50 +08:00
James Chen 8bb406a1ec issue #2087: Enabling acc when testing it. 2013-09-18 22:45:48 +08:00
James Chen 32089fa517 issue #2087: Adding new EventDispatcher Test. 
1) RemoveListenerWhenDispatching
   2) CustomEventTest
   3) LabelKeyboardEventTest
   4) SpriteAccelerationEventTest
 2013-09-18 22:23:02 +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 f23ca6a52c Merge pull request #3695 from dumganhar/iss2087-new-event-dispatcher 
Make XXXEventListener as friend class of XXXEvent. Move the test of eventdispatchertest.
 2013-09-18 03:35:03 -07:00
minggo 1878fa6041 Merge pull request #3694 from dabingnn/release30_bug_hot_fix 
rename test case to correct name
 2013-09-18 03:33:46 -07:00
Huabing.Xu 19e37d284e rename test case to correct name 2013-09-18 18:26:03 +08:00
James Chen 379a6efa2e Merge pull request #3693 from dumganhar/iss2087-new-event-dispatcher 
issue #2087: Adding Event::setUserData and Event::getUserData, making some methods inline.
 2013-09-18 03:16:15 -07: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