minggo
|
c84a1a157b
|
Merge pull request #3714 from ricardoquesada/icon_xcode_improvements
Icon xcode improvements
|
2013-09-20 01:24:15 -07:00 |
James Chen
|
3d41b7e33c
|
Adding EventDispatcher Test of removing all touch listeners.
|
2013-09-20 14:14:03 +08:00 |
Ricardo Quesada
|
2ab1b2ff04
|
Lua template: ios and mac projects in one Xcode file
Merged iOS and Mac projects into one single Xcode.proj file
|
2013-09-19 17:05:00 -07:00 |
Ricardo Quesada
|
d6675df75b
|
Adds iOS7 icons in SimpleGame and HelloCpp
|
2013-09-19 11:44:20 -07: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
|
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 |
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
|
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
|
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 |
Dhilan007
|
479355ee32
|
Unify Accelerometer coordinate on IOS and Android.
|
2013-09-19 00:04:50 +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 |
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
|
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
|
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 |
samuele3hu
|
d4669f3ad4
|
replace tabs with spaces
|
2013-09-18 17:19:34 +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
|
567dd00710
|
Modify Accelerometer lua test sample
|
2013-09-18 16:44:05 +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 |
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 |
minggo
|
801b7831df
|
Merge pull request #3671 from chengstory/#4684
Remove unused files from mk files.
|
2013-09-17 22:08:38 -07:00 |
Dhilan007
|
fd3a03a6ee
|
1.android platform:handle key event
2.android platform:fix Accelerometer value error
|
2013-09-18 12:04:35 +08:00 |
zhangcheng
|
820b8630dc
|
1. fixes failed to build linux.
|
2013-09-18 11:51:14 +08:00 |
minggo
|
40d91f0afa
|
disable compressing png when deploying for iOS device
|
2013-09-18 11:16:28 +08: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 |
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 |
James Chen
|
513237d5f6
|
Fixing armature test crash.
|
2013-09-17 23:03: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 |
James Chen
|
7d94878173
|
[win32] glfw keyboard callback is enabled now. Enables KeyboardTest for win32.
|
2013-09-17 22:34:20 +08: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 |
CaiWenzhi
|
f42797bc0d
|
Merge branch 'develop' into Merge_GUI_to_Develop
|
2013-09-17 20:43:16 +08:00 |
CaiWenzhi
|
9d07b2c1d2
|
Temp commit
|
2013-09-17 20:13:23 +08:00 |
minggo
|
ba820790ec
|
Merge https://github.com/cocos2d/cocos2d-x into merge-physics
|
2013-09-17 20:06:33 +08:00 |
James Chen
|
81df48b264
|
Updating submodule of JS-Test.
|
2013-09-17 19:32:15 +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 |
James Chen
|
43e98be8b7
|
Adding resources of CocoStudio GUI Test.
|
2013-09-17 17:46:40 +08:00 |
James Chen
|
beb8fa0b34
|
Merge branch 'develop' into box2d_test_bed_fix
|
2013-09-17 17:21:54 +08:00 |
James Chen
|
3fa539081f
|
Merge pull request #3644 from samuele3hu/developTest
Modify some lua test samples bug and delete tool/tolua++ folder[ci skip]
|
2013-09-17 01:41:50 -07:00 |
boyu0
|
acbb50b543
|
issue #2771: edit Xcode project setting.
|
2013-09-17 16:28:32 +08:00 |
boyu0
|
5040ae33a1
|
issue #2771: add comments
|
2013-09-17 16:27:43 +08:00 |
boyu0
|
270bd997cc
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
|
2013-09-17 14:46:36 +08:00 |
boyu0
|
0a53a12f51
|
issue #2771: update project setting
|
2013-09-17 14:31:43 +08:00 |
samuele3hu
|
3809a6feed
|
Repair some lua test samples bug and del tool/tolua++ folders
|
2013-09-17 13:59:48 +08:00 |
zhangcheng
|
a25c2cabf8
|
1. Fixes failed to build windows.
2. Upload CocoGUI Resources.
|
2013-09-17 13:25:15 +08:00 |
James Chen
|
9cd99f4c66
|
[Android] ArmatureTest compilation fix.
|
2013-09-17 11:56:00 +08:00 |
James Chen
|
fe1b11a814
|
Fixing wrong include.
|
2013-09-17 11:28:33 +08:00 |
boyu0
|
9f7bf4349c
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
|
2013-09-17 11:19:47 +08:00 |
boyu0
|
54f7146d5f
|
issue #2771: update vs project setting
|
2013-09-17 11:18:53 +08:00 |
James Chen
|
480b2dd1d8
|
[Linux] Updating Makefile for TestCpp.
|
2013-09-17 10:52:42 +08:00 |
James Chen
|
28b266bc5e
|
[Android] Android.mk fixes after adding GUI test.
|
2013-09-17 10:49:59 +08:00 |
James Chen
|
650e6ad6fc
|
issue #2087: [dispatcher] Updating MenuTest.
|
2013-09-17 10:46:31 +08:00 |
boyu0
|
481ad7ef12
|
issue #2771: update project setting
|
2013-09-17 10:41:08 +08:00 |
James Chen
|
365419a8b2
|
issue #2087: [dispatcher] Fix box2d_test crash.
|
2013-09-16 23:35:16 +08:00 |
boyu0
|
f96bc2355a
|
issue #2771: update android.mk
|
2013-09-16 22:56:20 +08:00 |
James Chen
|
157ffa9299
|
Merge pull request #3627 from nutty898/Merge_GUI_to_Develop
Merge gui to develop 3.0 branch
|
2013-09-16 07:45:23 -07:00 |
CaiWenzhi
|
f983155d7c
|
Modify scene sample
|
2013-09-16 22:29:53 +08:00 |
boyu0
|
a48fee881d
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
|
2013-09-16 22:16:50 +08:00 |
CaiWenzhi
|
d276bfc885
|
modify mk files
|
2013-09-16 22:15:29 +08:00 |
boyu0
|
2c66f1b95e
|
issue #2771: Implement the minimum set of physical API. Improve the PhysicsTest
|
2013-09-16 21:22:22 +08:00 |
James Chen
|
b128018f76
|
Merge branch 'suppressed-C4996' of https://github.com/savdalion/cocos2d-x into savdalion-suppressed-C4996
Conflicts:
extensions/CocoStudio/Armature/external_tool/GLES-Render.cpp
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
|
2013-09-16 20:58:26 +08:00 |
CaiWenzhi
|
759fcc147b
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Merge_GUI_to_Develop
|
2013-09-16 20:55:55 +08:00 |
CaiWenzhi
|
ca599b4852
|
Merge guy to 3.0 branch
|
2013-09-16 20:54:13 +08:00 |
signmotion
|
5dffb1b44e
|
Deprecated methods are replaced (warning MSVC C4996 is suppressed).
|
2013-09-16 15:38:03 +03:00 |
James Chen
|
72c2d4ca35
|
Merge branch 'develop' into 2youyouo2-develop
Conflicts:
extensions/proj.win32/libExtensions.vcxproj.filters
|
2013-09-16 20:12:03 +08:00 |
minggo
|
21d299150e
|
Merge pull request #3621 from minggo/develop
upstream synchronize
|
2013-09-16 04:47:21 -07:00 |
minggo
|
819fbf2866
|
upstream synchronize
|
2013-09-16 19:46:14 +08:00 |
James Chen
|
83d61dff44
|
[Armature] Fixing compilation errors.
|
2013-09-16 19:27:34 +08:00 |
James Chen
|
208f705845
|
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into 2youyouo2-develop
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h
|
2013-09-16 18:18:23 +08:00 |
James Chen
|
d8fb3aa731
|
issue #2087: [dispatcher] Reverts: HelloCpp.
|
2013-09-16 16:22:22 +08:00 |
James Chen
|
37dd173644
|
issue #2087: [dispatcher] Fixing errors in test.
|
2013-09-16 16:03:39 +08:00 |
James Chen
|
8e668cd837
|
issue #2087: [dispatcher] Rename FixedPriorityChangedTest to FixedPriorityTest.
|
2013-09-16 16:02:48 +08:00 |
James Chen
|
46e1291ce1
|
issue #2087: [dispatcher] Enabled touch for Box2dTestBed, removed touch listener before re-adding.
|
2013-09-16 15:55:03 +08:00 |
James Chen
|
990b801b11
|
issue #2087: [dispatcher] Reverts: glGetError --> CHECK_GL_ERROR_DEBUG.
|
2013-09-16 15:54:02 +08:00 |
James Chen
|
7921b45090
|
issue #2087: [dispatcher] New Dispatcher Test: Fixed priority. Adding include.
|
2013-09-16 15:43:48 +08:00 |
James Chen
|
b3cade3be0
|
issue #2087: [dispatcher] New Dispatcher Test: Fixed priority.
|
2013-09-16 15:43:20 +08:00 |
2youyou2
|
a08ce3df73
|
change singleton class get method to getInstance
|
2013-09-16 15:16:05 +08:00 |
2youyou2
|
16c70363dd
|
standardizate code
|
2013-09-16 14:56:59 +08:00 |
James Chen
|
e31c4f008d
|
Merge pull request #3597 from chengstory/#4560
SceneEditorTest He version
|
2013-09-15 20:23:05 -07:00 |
minggo
|
81a26d44f6
|
Merge pull request #3596 from dumganhar/new-event-dispatcher-rename
[New Event Dispatcher] Using rename registerEventListener to addEventListener, unregisterEventListener to removeEventListener.
|
2013-09-15 20:13:51 -07:00 |
minggo
|
37cfc855b9
|
Merge pull request #3581 from dabingnn/new_shader_test
issue #2782: add shader test sprite and close issue
|
2013-09-15 19:36:51 -07:00 |
samuele3hu
|
6efe3e7eeb
|
issue #2794:Add a newline
|
2013-09-16 10:04:58 +08:00 |
James Chen
|
9891077bba
|
[dispatcher] Adding 'emit touch event' menu item.
|
2013-09-15 21:56:02 +08:00 |
2youyou2
|
db4813f161
|
1.remove CC from class name
2.fix async loading
|
2013-09-15 19:08:45 +08:00 |
James Chen
|
e3cce1fd0b
|
[dispatcher] 100 times for Touch event dispatch test.
|
2013-09-15 18:26:17 +08:00 |
James Chen
|
62a0dc41c3
|
[dispatcher] Adding TouchEvent dispatch test.
|
2013-09-15 17:49:36 +08:00 |
2youyou2
|
9fd89dbfc2
|
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop
Conflicts:
extensions/CCArmature/CCArmature.cpp
extensions/CCArmature/CCArmature.h
extensions/CCArmature/CCBone.cpp
extensions/CCArmature/CCBone.h
extensions/CCArmature/animation/CCArmatureAnimation.cpp
extensions/CCArmature/animation/CCTween.cpp
extensions/CCArmature/animation/CCTween.h
extensions/CCArmature/datas/CCDatas.cpp
extensions/CCArmature/datas/CCDatas.h
extensions/CCArmature/display/CCDecorativeDisplay.cpp
extensions/CCArmature/display/CCDecorativeDisplay.h
extensions/CCArmature/display/CCDisplayFactory.cpp
extensions/CCArmature/display/CCDisplayFactory.h
extensions/CCArmature/display/CCDisplayManager.cpp
extensions/CCArmature/display/CCDisplayManager.h
extensions/CCArmature/display/CCSkin.cpp
extensions/CCArmature/display/CCSkin.h
extensions/CCArmature/external_tool/CCTexture2DMutable.cpp
extensions/CCArmature/external_tool/Json/CSContentJsonDictionary.cpp
extensions/CCArmature/external_tool/Json/CSContentJsonDictionary.h
extensions/CCArmature/external_tool/Json/lib_json/json_reader.cpp
extensions/CCArmature/external_tool/Json/lib_json/json_value.cpp
extensions/CCArmature/external_tool/Json/lib_json/value.h
extensions/CCArmature/physics/CCColliderDetector.cpp
extensions/CCArmature/physics/CCColliderDetector.h
extensions/CCArmature/utils/CCArmatureDataManager.cpp
extensions/CCArmature/utils/CCArmatureDefine.h
extensions/CCArmature/utils/CCDataReaderHelper.cpp
extensions/CCArmature/utils/CCSpriteFrameCacheHelper.cpp
extensions/CCArmature/utils/CCSpriteFrameCacheHelper.h
extensions/CCArmature/utils/CCUtilMath.cpp
extensions/cocos-ext.h
extensions/proj.win32/libExtensions.vcxproj
extensions/proj.win32/libExtensions.vcxproj.filters
samples/Cpp/TestCpp/Classes/ExtensionsTest/ArmatureTest/ArmatureScene.cpp
samples/Cpp/TestCpp/Classes/ExtensionsTest/ArmatureTest/ArmatureScene.h
samples/Cpp/TestCpp/Resources/armature/Cowboy.ExportJson
|
2013-09-15 15:19:13 +08:00 |
samuele3hu
|
1e093868c8
|
issue #2768:Modify testlua and hellolua sample's linux mayflies.
|
2013-09-15 09:53:08 +08:00 |
2youyou2
|
2213e8118d
|
fix armature hd crash
|
2013-09-14 23:31:33 +08:00 |
zhangcheng
|
841ea4cfdd
|
1. change 480*320 to 960*640.
|
2013-09-14 20:52:35 +08:00 |
zhangcheng
|
95236e86d9
|
1. update scenetest version.
|
2013-09-14 20:49:02 +08:00 |
samuele3hu
|
95831eb70f
|
issue #2768:Add a newline
|
2013-09-14 20:00:26 +08:00 |
yinkaile
|
5e1f91d396
|
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop
Conflicts:
extensions/CocoStudio/Armature/CCArmature.h
extensions/CocoStudio/Armature/CCBone.h
extensions/CocoStudio/Armature/animation/CCArmatureAnimation.h
extensions/CocoStudio/Armature/animation/CCProcessBase.h
extensions/CocoStudio/Armature/animation/CCTween.h
extensions/CocoStudio/Armature/datas/CCDatas.h
extensions/CocoStudio/Armature/display/CCDecorativeDisplay.h
extensions/CocoStudio/Armature/display/CCDisplayManager.h
extensions/CocoStudio/Armature/external_tool/CCTexture2DMutable.h
extensions/CocoStudio/Armature/physics/CCColliderDetector.h
extensions/CocoStudio/Armature/physics/CCPhysicsWorld.h
extensions/CocoStudio/Armature/utils/CCArmatureDataManager.h
extensions/CocoStudio/Armature/utils/CCSpriteFrameCacheHelper.h
|
2013-09-14 19:54:49 +08:00 |
samuele3hu
|
85ca0136f0
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Bridge
|
2013-09-14 19:53:08 +08:00 |
samuele3hu
|
aa4c90e97a
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Armature
Conflicts:
extensions/cocos-ext.h
|
2013-09-14 19:29:36 +08:00 |
zhangcheng
|
acf9754814
|
1. add supported for 480*320 on scenetest.
|
2013-09-14 19:03:15 +08:00 |
zhangcheng
|
0121943c11
|
1. Adds SceneEditorTest hd version
|
2013-09-14 16:34:26 +08:00 |
James Chen
|
1ed980d27c
|
[dispatcher] Updating win32 TestCpp.vcxproj.
|
2013-09-14 10:32:37 +08:00 |
James Chen
|
997a5a36c1
|
[dispatcher] Renaming 'registerEventListenerXXX' to 'addEventListenerXXX'.
|
2013-09-14 09:02:49 +08:00 |
James Chen
|
dd7bfd7b60
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase
Conflicts:
cocos2dx/CCDirector.h
cocos2dx/keyboard_dispatcher/CCKeyboardDispatcher.h
cocos2dx/keypad_dispatcher/CCKeypadDelegate.h
cocos2dx/keypad_dispatcher/CCKeypadDispatcher.h
cocos2dx/layers_scenes_transitions_nodes/CCLayer.h
cocos2dx/menu_nodes/CCMenu.h
cocos2dx/platform/CCAccelerometerDelegate.h
cocos2dx/platform/android/CCAccelerometer.h
cocos2dx/platform/ios/CCAccelerometer.h
cocos2dx/platform/mac/CCAccelerometer.h
cocos2dx/platform/win32/CCAccelerometer.h
cocos2dx/script_support/CCScriptSupport.h
cocos2dx/touch_dispatcher/CCTouchDelegateProtocol.h
cocos2dx/touch_dispatcher/CCTouchDispatcher.h
cocos2dx/touch_dispatcher/CCTouchHandler.h
extensions/CocoStudio/Components/CCInputDelegate.h
|
2013-09-13 19:06:09 +08:00 |
James Chen
|
dd55822465
|
[dispatcher] Updating NewEventDispatcherTest.cpp.
|
2013-09-13 18:51:00 +08:00 |
James Chen
|
ff24eac21a
|
[dispatcher] Adding new EventDispatcher Test to Makefile and project.
|
2013-09-13 18:08:00 +08:00 |
yinkaile
|
74bd8b09d6
|
update armature
|
2013-09-13 18:07:37 +08:00 |
James Chen
|
cf66992b51
|
[dispatcher] Updating HelloWorldScene.cpp, if you wish to using the same listener for different target, please invoke clone to create a new one.
|
2013-09-13 18:02:26 +08:00 |
James Chen
|
7729756d04
|
[dispatcher] Updating EventDispatcherTest.cpp.
|
2013-09-13 18:01:32 +08:00 |
minggo
|
9c259823e1
|
Merge pull request #3590 from Dhilan007/develop
issue #2800:Can not hide status bar on iOS 7
|
2013-09-13 02:12:30 -07:00 |
James Chen
|
51548b9542
|
Adding NewEventDispatcher Test.
|
2013-09-13 16:38:21 +08:00 |
Dhilan007
|
18f2f831b4
|
issue #2800:Can not hide status bar on iOS 7
fixed #2800:User prefersStatusBarHidden in RootViewController on IOS 7 to hide status.
|
2013-09-13 16:07:02 +08:00 |
Dhilan007
|
5350b1ad06
|
issue #2800:Can not hide status bar on iOS 7
fixed #2800:User prefersStatusBarHidden in RootViewController on IOS 7 to hide status.
|
2013-09-13 15:54:58 +08:00 |
minggo
|
c4cb2582cc
|
fixed #2793:best practice of New Label
|
2013-09-13 11:46:46 +08:00 |
James Chen
|
c948a67243
|
[dispatcher] Updating SimpleGame.
|
2013-09-12 22:12:58 +08:00 |
James Chen
|
6f37529236
|
[dispatcher] Adding 'Node::updateEventPriorityIndex' and making 'Node::addEventId(removeEventId)' method to be private.
|
2013-09-12 20:47:15 +08:00 |
James Chen
|
24c8438fa6
|
[Dispatcher] Updating Android.mk, and some refractor.
|
2013-09-12 17:31:37 +08:00 |
James Chen
|
6623879f6d
|
[EventDispatcher] Refactoring Touch, Touch doesn't inherit from Object now. Using std::vector<Touch*> to dispatch event and a little performance improved.
|
2013-09-12 14:26:39 +08:00 |
Huabing.Xu
|
b1b192ce70
|
closed #2782: shadertestSprite remove blank line
|
2013-09-12 10:31:14 +08:00 |
Huabing.Xu
|
53ffedc558
|
issue #2782: shadertestSprite add lensFlare Sprite Test Case
|
2013-09-12 10:25:55 +08:00 |
James Chen
|
da1101beeb
|
[Dispatcher] New event dispatcher, first commit.
|
2013-09-11 22:09:34 +08:00 |
samuele3hu
|
7c62509b02
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Bridge
|
2013-09-11 09:50:31 +08:00 |
samuele3hu
|
29f0909714
|
issue #2768:Add LuaObjectBridge and LuaJavaBridge
|
2013-09-11 09:48:24 +08:00 |
boyu0
|
d161c6a576
|
issue #2771: Add PhysicsTest to TestCpp. Add initTest to TestScene, move Scene::init() from constructor to TestScene::initTest()
|
2013-09-10 17:41:06 +08:00 |
chengstory
|
bdfde89ef8
|
Merge branch '#develop' into #4551
Conflicts:
samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters
|
2013-09-10 16:25:31 +08:00 |
minggo
|
31ce15ea46
|
Merge pull request #3571 from dabingnn/new_shader_test
issue #2782 shader test sprite
|
2013-09-09 22:55:53 -07:00 |
chengstory
|
e04a47b807
|
1. update mkfile.
|
2013-09-10 13:08:05 +08:00 |
Huabing.Xu
|
8e35e7cc27
|
issue #2782: shadertestSprite change test case textures and add normal sprite for comparison
|
2013-09-10 11:45:38 +08:00 |
chengstory
|
669de88e73
|
1. remove any unused functions.
|
2013-09-10 11:02:50 +08:00 |
Huabing.Xu
|
2912260b3a
|
issue #2782: shadertestSprite linux and windows version
|
2013-09-10 11:00:57 +08:00 |
zhangcheng
|
98fce2fa84
|
1. update Samples on develop branch.
|
2013-09-10 09:53:15 +08:00 |
Huabing.Xu
|
5801e9118c
|
issue #2782: remove a blank test case
|
2013-09-10 09:38:12 +08:00 |
Huabing.Xu
|
f2fc710f86
|
issue #2782: shadertestSprite android make file
|
2013-09-10 09:32:03 +08:00 |
Nako Sung
|
31e3faaa4f
|
Update AppDelegate.cpp
|
2013-09-09 22:38:37 +09:00 |
Huabing.Xu
|
8a86a883d0
|
issue #2782: update mac version, update test case title
|
2013-09-09 21:33:01 +08:00 |
zhangcheng
|
99f32077d2
|
1. upload SceneTest Resources.
|
2013-09-09 19:52:07 +08:00 |
Huabing.Xu
|
d7d914feb1
|
Merge branch 'develop' into new_shader_test
|
2013-09-09 18:18:31 +08:00 |