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 |
zhangcheng
|
529d43544f
|
1. rename CCCActionFrameEasing.cpp to CCActionFrameEasing.cpp.
|
2013-09-18 11:22:30 +08:00 |
minggo
|
40d91f0afa
|
disable compressing png when deploying for iOS device
|
2013-09-18 11:16:28 +08:00 |
James Chen
|
37ce756d12
|
Merge pull request #3674 from CocosRobot/updategeneratedsubmodule_1379468394
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
|
2013-09-17 18:51:46 -07:00 |
CocosRobot
|
8c1bdd900b
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-09-18 01:39:57 +00: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
|
38b618bc4f
|
Merge pull request #3661 from samuele3hu/developTest
Modify AppDelegate.cpp file of multi-platform-lua for Design Resolution Size
|
2013-09-17 18:36:21 -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 |
zhangcheng
|
0e8b6bd57b
|
Merge branch '#4684' of https://github.com/chengstory/cocos2d-x into #4684
|
2013-09-17 23:47:18 +08:00 |
zhangcheng
|
0708edb762
|
1. remove CocoStudio/GUI/Action *.cpp *.h
|
2013-09-17 23:45:53 +08:00 |
minggo
|
95bdfcd84d
|
Merge pull request #3668 from CocosRobot/updategeneratedsubmodule_1379432233
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-09-17 08:41:13 -07:00 |
minggo
|
fce3aa756d
|
Merge pull request #3667 from dabingnn/release30_bug_hot_fix
check glfw has been installed when installing glfw
|
2013-09-17 08:41:00 -07:00 |
CocosRobot
|
eb88e8e365
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-09-17 15:37:17 +00:00 |
Huabing.Xu
|
e521d881b2
|
check glfw has been installed when installing glfw
|
2013-09-17 23:26:54 +08:00 |
James Chen
|
4542732207
|
Merge pull request #3664 from dumganhar/keyboard_test
[win32] glfw keyboard callback is enabled now. Enables KeyboardTest for win32.
|
2013-09-17 08:23:02 -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 |
minggo
|
c2e53d5673
|
Merge pull request #3665 from minggo/merge-physics
Merge physics
|
2013-09-17 08:18:55 -07:00 |
Dhilan007
|
509bea531a
|
android platform:fix EditBox not show input box and crash.
|
2013-09-17 23:16:32 +08:00 |
Dhilan007
|
3a283839bb
|
Merge https://github.com/cocos2d/cocos2d-x into develop
|
2013-09-17 23:06:04 +08:00 |
James Chen
|
513237d5f6
|
Fixing armature test crash.
|
2013-09-17 23:03:33 +08:00 |
chengstory
|
5fade0829f
|
1. change files name.
|
2013-09-17 22:58:33 +08:00 |
zhangcheng
|
c065dd2920
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into #4684
|
2013-09-17 22:41:42 +08:00 |
zhangcheng
|
a1d2045793
|
1.rename cocoaction system files
|
2013-09-17 22:39:42 +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 |
chengstory
|
cf1f054012
|
1. update mac and iOS projects.
|
2013-09-17 21:36:30 +08:00 |
minggo
|
5e858becf4
|
Merge pull request #3660 from nutty898/Merge_GUI_to_Develop
Merge gui to develop
|
2013-09-17 06:25:09 -07:00 |
CaiWenzhi
|
1f45bad5e7
|
Modify guy example
|
2013-09-17 21:19:04 +08:00 |
zhangcheng
|
ec401d1148
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into #4684
|
2013-09-17 21:15:36 +08:00 |
zhangcheng
|
b86a8271d9
|
1. Upload Cocostudio Action.
|
2013-09-17 21:14:45 +08:00 |
samuele3hu
|
0428cbbade
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTest
|
2013-09-17 21:02:29 +08:00 |
CaiWenzhi
|
d9721a41dd
|
Merge branch 'develop' into Merge_GUI_to_Develop
|
2013-09-17 21:01:50 +08:00 |
samuele3hu
|
423e7adf93
|
Modify AppDelegate.cpp file of multi-platform-lua
|
2013-09-17 21:01:43 +08:00 |