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 |
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 |
James Chen
|
da1101beeb
|
[Dispatcher] New event dispatcher, first commit.
|
2013-09-11 22:09:34 +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 |
Huabing.Xu
|
d763de3d3c
|
new shader test code
|
2013-09-09 17:49:13 +08:00 |
성낙호
|
bf4eaa7e7c
|
merged
|
2013-09-09 18:20:16 +09:00 |
성낙호
|
3a4c9f9fb0
|
men leak fixed (life-cycle management was hand downed to scene-graph)
|
2013-09-09 17:07:32 +09:00 |
minggo
|
c5b113c35e
|
Merge pull request #3554 from ricardoquesada/fileutils_perf_improvements
Fileutils perf improvements
|
2013-09-08 19:50:12 -07:00 |
James Chen
|
ba9fdc5774
|
Reverts samples/Cpp/HelloCpp/proj.win32/main.cpp
|
2013-09-08 11:30:50 +08:00 |
James Chen
|
b8c82ae5a9
|
[develop] Warning fixes.
|
2013-09-08 11:26:38 +08:00 |
Ricardo Quesada
|
8078a574c2
|
snapshopTextures are no longer supported
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
|
2013-09-06 22:55:36 -07:00 |
Ricardo Quesada
|
b2a81b5b86
|
Removes some Hungarion notation...
...and improves performance in FileUtils: String is not created
|
2013-09-06 18:46:33 -07:00 |
Ricardo Quesada
|
b78382d5e5
|
Performance improvements in FileUtils / TextureCache
Added common "apple" platform to avoid duplicate files in FileUtils and other common files
Improves performance in fetching files.
|
2013-09-06 15:33:28 -07:00 |
minggo
|
76a1b36191
|
Merge pull request #3546 from minggo/alloc_perf_test
Alloc perf test
|
2013-09-05 23:30:15 -07:00 |
minggo
|
8e0bce344c
|
Merge branch 'alloc_perf_test' of https://github.com/minggo/cocos2d-x into alloc_perf_test
|
2013-09-06 13:45:59 +08:00 |
minggo
|
d723c4ef3f
|
Merge branch 'alloc_perf_test' of https://github.com/ricardoquesada/cocos2d-x into alloc_perf_test
|
2013-09-06 13:45:23 +08:00 |
minggo
|
1664d3503d
|
add PerformanceAllocTest.cpp/h to vs project and fix some compiling errors
|
2013-09-06 12:51:37 +08:00 |
Ricardo Quesada
|
1071ab9d37
|
Adds a new test: sprite with image
|
2013-09-05 21:35:15 -07:00 |
minggo
|
0131ecf705
|
add PerformanceAllocTest.cpp/h to Android.mk and linux project setting
|
2013-09-06 11:44:10 +08:00 |
Ricardo Quesada
|
02500372ed
|
Adds new perf test: alloc / dealloc
|
2013-09-05 20:02:04 -07:00 |
minggo
|
249b4d79a3
|
Merge pull request #3503 from dabingnn/Iss2460-glfw-refractor
Iss2460 glfw refractor
|
2013-09-05 18:28:31 -07:00 |
samuele3hu
|
32d056df18
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TableView
|
2013-09-04 14:03:21 +08:00 |
samuele3hu
|
6815e01f84
|
issue #2764:Add TableView lua binding and releated test sample
|
2013-09-04 14:02:22 +08:00 |
minggo
|
9dedb072e6
|
Merge pull request #3528 from natural-law/ForPlugin
Modify the method cocos_android_app_init()
|
2013-09-03 22:50:40 -07:00 |