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 |
minggo
|
1d5980db22
|
Merge pull request #3691 from samuele3hu/developTest
Repair some lua test samples and modify handle_key_input function
|
2013-09-18 02:44:21 -07:00 |
samuele3hu
|
9b87bf4cb1
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTest
|
2013-09-18 17:25:35 +08:00 |
samuele3hu
|
d4669f3ad4
|
replace tabs with spaces
|
2013-09-18 17:19:34 +08: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 |
minggo
|
d38dee32a0
|
Merge pull request #3687 from liamcindy/develop_action
limited action frame index
|
2013-09-18 02:10:26 -07: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 |
Huabing.Xu
|
a2dee37b0e
|
glfw EGLView set alloc on the stack to prevent memory leak
|
2013-09-18 17:00:21 +08:00 |
samuele3hu
|
31bccd52d4
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTest
|
2013-09-18 16:44:56 +08:00 |
samuele3hu
|
567dd00710
|
Modify Accelerometer lua test sample
|
2013-09-18 16:44:05 +08:00 |
Liam
|
3515a4f286
|
limited action frame index
|
2013-09-18 16:36:16 +08:00 |
yuye.liu
|
784464d29f
|
particle designer2.0 support
|
2013-09-18 16:21:48 +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 |
samuele3hu
|
05f610d3ba
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTest
|
2013-09-18 15:04:49 +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 |
samuele3hu
|
841975706e
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTest
|
2013-09-18 14:50:01 +08:00 |
samuele3hu
|
64c5e183ce
|
Add setKeypadEnabled and isKeypadEnabled deprecated functions
|
2013-09-18 14:49:19 +08:00 |
minggo
|
c1d7cc0f29
|
Merge pull request #3684 from minggo/develop
upstream to js tests
|
2013-09-17 23:25:00 -07:00 |
minggo
|
6f196e1470
|
upstream to js tests
|
2013-09-18 14:24:21 +08:00 |
Dhilan007
|
a9338f0e06
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-09-18 14:21:04 +08:00 |
James Chen
|
42394d162d
|
Merge pull request #3683 from dumganhar/memory-leak-check
Fix a memory leak in Dictionary::createWithContentOfFile().
|
2013-09-17 23:07:30 -07:00 |
James Chen
|
d66420586c
|
Fix a memory leak in Dictionary::createWithContentOfFile().
|
2013-09-18 14:09:02 +08:00 |
James Chen
|
39259c0553
|
Merge pull request #3681 from dumganhar/iss2087-new-event-dispatcher
issue #2087: Small fix for EventDispatcher. Adding EventDispatcher::destroyInstance method.[ci skip]
|
2013-09-17 22:44:13 -07:00 |
minggo
|
801b7831df
|
Merge pull request #3671 from chengstory/#4684
Remove unused files from mk files.
|
2013-09-17 22:08:38 -07: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
|
1fcd23bfd0
|
Merge branch 'develop' of github.com:cocos2d/cocos2d-x into develop
|
2013-09-18 12:38: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 |
chengstory
|
1bef5588f3
|
1. fixes failed to build iOS, mac.
|
2013-09-18 11:53:13 +08:00 |
zhangcheng
|
820b8630dc
|
1. fixes failed to build linux.
|
2013-09-18 11:51:14 +08:00 |
minggo
|
be3510cb74
|
Merge pull request #3678 from minggo/fix-crash-ios-dev
disable compressing png when deploying for iOS device
|
2013-09-17 20:42:40 -07:00 |