Commit Graph

733 Commits

Author SHA1 Message Date
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
CaiWenzhi d276bfc885 modify mk files 2013-09-16 22:15:29 +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 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 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
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
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
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
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 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 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 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
chengstory bdfde89ef8 Merge branch '#develop' into #4551
Conflicts:
	samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters
2013-09-10 16:25:31 +08: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