Commit Graph

840 Commits

Author SHA1 Message Date
Jason Xu b5f83c30b6 fix indention 2013-11-07 17:08:16 +08:00
CaiWenzhi 9f2297a5a6 add "retain" to listeners 2013-11-07 16:46:41 +08:00
Jason Xu c9f814c016 fix Accelerometer Test with missing: Device::setAccelerometerEnabled(true); 2013-11-07 16:39:41 +08:00
boyu0 ef5440f738 issue #2771: change rayCast and rectQuery callback class to std::function 2013-11-07 16:23:50 +08:00
CaiWenzhi 7163dd4d76 Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch 2013-11-06 18:13:51 +08:00
2youyou2 fcf0b1ef5f Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-11-06 16:06:37 +08:00
CaiWenzhi e0aa82da13 Merge master branch to develop branch 2013-11-06 16:04:06 +08:00
boyu0 75dd32cde9 issue #2771: fix physics test compile error 2013-11-06 14:34:27 +08:00
Luis Parravicini 8b1d3af720 added | operator for Control::EventType 2013-11-05 23:55:24 -03:00
boyu0 af129e25f0 issue #2771: change some coding style 2013-11-05 20:02:58 +08:00
2youyou2 16c23d0ad3 remove CC_PROPERTY and CC_SYNTHESIZE. 2013-11-05 19:53:38 +08:00
boyu0 8c62bf813f issue #2771: enhance API and add Slice demo 2013-11-05 15:54:33 +08:00
2youyou2 3eef64c3b8 1. Change NULL to null
2. Remove CocoStudio/Armature files
2013-11-05 15:32:13 +08:00
2youyou2 b076711b69 fix compile error 2013-11-05 13:42:27 +08:00
Nite Luo e4ffd250cb Simple implementation of RenderCommand and RenderQueue 2013-11-04 09:14:22 -08:00
boyu0 00acd67ff3 issue #2771: finish OneWayPlatform demo and fix some bugs 2013-11-04 14:36:38 +08:00
minggo 25b0ffe853 Merge pull request #4022 from boyu0/iss2771_physical
issue #2771: physical
2013-11-03 18:40:14 -08:00
James Chen 8f213420eb closed #3106: Update NewEventDispatcherTest.cpp. 2013-11-02 22:05:04 +08:00
James Chen 7dc6513687 Adding more tests for EventDispatcherTest. 2013-11-02 21:47:00 +08:00
boyu0 04c8e9f34e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-11-02 00:12:14 +08:00
boyu0 6d37aa8cd5 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-11-01 17:39:09 +08:00
James Chen c754e1b64f Merge pull request #4035 from darkdukey/mousewheel_mac
issue #3099: Adding MouseEvent and MouseListener, Adding Mouse Support For Desktop Platform.
2013-11-01 02:33:28 -07:00
boyu0 2f67ceb495 issue #2771: fix some code style 2013-11-01 16:26:03 +08:00
boyu0 b2951b70ff issue #2771: enhance Listener use EventListener mechanism 2013-11-01 14:50:06 +08:00
2youyou2 a9054ba14a 1.add method to set collider filter 2013-11-01 14:36:44 +08:00
Dhilan007 150f1aeaab issue #2893:improve new label 2013-10-31 20:17:30 +08:00
boyu0 dec749a692 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-10-31 18:20:32 +08:00
2youyou2 005d3c0121 1. fix if frame event is at the last frame, it may emit event several times
2. add method for removing single data info
3. add test TEST_DIRECT_LOADING
4. add test TEST_FRAME_EVENT
5. add method for getting calculated collider vertex
2013-10-31 17:28:14 +08:00
Nite Luo 49a2acfbd4 Merge branch 'develop' into mousewheel_mac 2013-10-31 00:10:45 -07:00
Nite Luo fe04448c8d Merge folder changes from develop 2013-10-30 23:19:36 -07:00
Dhilan007 12db6a32ab issues #2893:
1.Texture atlas are create on demand, based on the characters used in the label.
  2.Create Quads (and not sprites) for each letter.
2013-10-31 10:49:37 +08:00
samuelhu 1f07a659a6 issue #3069:Modify layer lua register and add some compatible lua binding functions 2013-10-31 09:49:04 +08:00
boyu0 e8d06496d0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-10-30 17:27:09 +08:00
boyu0 391cda44ef issue #2771: edit listener 2013-10-30 15:53:58 +08:00
yinkaile 80b97be6f4 update develop 2013-10-30 11:34:16 +08:00
yinkaile 8fa8b9f844 update develop 2013-10-30 09:41:40 +08:00
boyu0 cae9a3e54f issue #2771: add physics pump demo and fix bugs 2013-10-29 17:31:35 +08:00
James Chen cb7a762584 issue #3069: Updating EventDispatcherTest. 2013-10-29 14:59:05 +08:00
boyu0 66d1bbd89f issue #2771: edit physics effect with all bodies and fix some bugs 2013-10-28 16:17:19 +08:00
James Chen a829325240 issue #3069: Updating EventDispatcherTest. 2013-10-28 16:00:19 +08:00
boyu0 d0d8694091 issue #2771: fix some retain/release bugs 2013-10-28 11:08:41 +08:00
James Chen e6b0134080 issue #3069: Updating Custom event test. 2013-10-28 10:49:43 +08:00
James Chen 48ce5e39fe EventDispatcher is managed by Director now, like Scheduler and ActionManager. 2013-10-26 15:04:01 +08:00
James Chen 9bf44a6c83 issue #3069: Renaming 'removeListeners' to 'removeEventListeners'. 2013-10-25 16:34:26 +08:00
James Chen 27b71ba73c Use integer as event type and listener type. 2013-10-25 10:53:47 +08:00
James Chen b5cac51f97 PhysicsTest update. 2013-10-25 10:53:47 +08:00
James Chen 9c4bc9e8ed Update physicsTest. 2013-10-25 10:53:47 +08:00
James Chen 7854a13278 Small fix for Bug-422.cpp and MenuTest.cpp. 2013-10-25 10:53:47 +08:00
James Chen b131e8c509 Update menu test. 2013-10-25 10:53:46 +08:00
James Chen 9ed263056c Use eventDispatcher to dispatch event. Remove controller codes in Layer. 2013-10-25 10:53:46 +08:00
James Chen 1f3863e787 Event Dispatcher refactor commit. TestCpp could run. 2013-10-25 10:53:45 +08:00
James Chen cfaef2a01a Adding onEnterHook, onXXXHook for Node. 2013-10-25 10:53:45 +08:00
boyu0 a8ddca81bd issue #2771: fix some compile error in win32 2013-10-23 18:52:09 +08:00
boyu0 899f720efa issue #2771: implement getShapeAtPoint and getShapesAtPoint 2013-10-23 17:28:23 +08:00
boyu0 17422c3123 issue #2771: fix some compile error in win32 2013-10-23 11:08:21 +08:00
boyu0 51801d9218 issue #2771: fix some compile error in android and win32 2013-10-23 10:11:08 +08:00
boyu0 24561860f0 issue #2771: add ray cast test 2013-10-22 18:00:24 +08:00
boyu0 6aef4476d9 issue #2771: edit some mistake when merge 2013-10-18 15:55:47 +08:00
boyu0 d12ee5f120 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-10-18 15:34:13 +08:00
boyu0 89448135ad issue #2771: implement some joint definition. 2013-10-17 10:57:48 +08:00
minggo 8f7a489a4d issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
James Chen 7dc8aeb156 issue #2905: Updating include path for 'cocostudio' module, adding 'cocostudio' prefix. 2013-10-16 11:19:01 +08:00
minggo 6fc2be62f5 issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
boyu0 d1fead368d issue #2771: migrate the PhysicsBody definition 2013-10-15 16:55:08 +08:00
boyu0 5c7603e0ce issue #2771: change angular damping to moment. (these two have different meaning, change to the correct one) 2013-10-14 13:56:08 +08:00
Nite Luo ddf21e8bd1 Implement mouse callback for windows 2013-10-11 16:33:49 -07:00
Nite Luo 09c0e23b5d Mouse working on mac 2013-10-11 14:35:38 -07:00
minggo 0130aae044 Merge pull request #3916 from boyu0/iss2771_physical
[ci skip]issue 2771: physical
2013-10-10 19:50:19 -07:00
boyu0 acf1d72213 issue #2771: delete #define RAND_MAX in PhysicsTest.cpp(already defined in stdlib.h) 2013-10-11 10:24:55 +08:00
boyu0 775a81ae19 issue #2771: Let the sprites added to SpriteBatchNode support physics. 2013-10-10 18:31:43 +08:00
Dhilan007 5ea5c394e7 fix compile fail on vs2012. 2013-10-10 17:17:10 +08:00
boyu0 381f904cd4 issue #2771: add PhysicsMaterial 2013-10-09 17:53:12 +08:00
boyu0 4747e37acf issue #2771: let PhysicsShape::create doesn't need to pass the PhysicsBody 2013-10-09 13:41:19 +08:00
Nite Luo a2c2546942 Implement MouseWheel Event, also fix a typo in EventListener interface 2013-10-04 10:07:39 -07:00
boyu0 35259588a3 issue #2771: fix some bugs in PhysicsShape 2013-09-30 21:48:25 +08:00
boyu0 9c16a45f33 issue #2771: separate the PhysicsBody and the PhysicsShape. 2013-09-30 20:43:19 +08:00
samuelhu 6aa18423e6 issue #2792 : Performance Test: Sprite drawing 2013-09-30 16:22:55 +08:00
boyu0 18a4b18368 issue #2771: move _physicsBody from sprite to node 2013-09-30 13:02:17 +08:00
boyu0 3dbe74db1a issue #2771: refactor PhysicsTest 2013-09-29 15:09:53 +08:00
Ricardo Quesada cc4695507a Test compiles with box2d enabled 2013-09-26 16:23:13 -07:00
James Chen 3ffad35f0e Merge pull request #3741 from signmotion/develop
Fixed some compiling-warnings (MSVC2012).[ci skip]
2013-09-24 02:27:14 -07:00
CaiWenzhi fa892c2158 Remove layoutexecutant class 2013-09-23 19:16:20 +08:00
signmotion 7d139a3bc3 Fixed compiling-warnings (MSVC2012): C4996(* was declared deprecated), C4305 (* truncation from 'double' to 'float'), C4018 (* signed/unsigned mismatch), C4800(* forcing value to bool 'true' or 'false'). 2013-09-22 23:50:54 +03:00
minggo bcb171e3c9 fix line end in windows 2013-09-20 22:23:13 +08:00
minggo 4c9771ba3c rename some class names to obey cocos2d-x coding style 2013-09-20 19:19:31 +08:00
James Chen 3d41b7e33c Adding EventDispatcher Test of removing all touch listeners. 2013-09-20 14:14:03 +08: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 c7612fee15 Fixing MenuTest crash. 2013-09-18 23:43:04 +08: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 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
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 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
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
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 b86a8271d9 1. Upload Cocostudio Action. 2013-09-17 21:14:45 +08:00
CaiWenzhi 9d07b2c1d2 Temp commit 2013-09-17 20:13:23 +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 beb8fa0b34 Merge branch 'develop' into box2d_test_bed_fix 2013-09-17 17:21:54 +08:00
boyu0 5040ae33a1 issue #2771: add comments 2013-09-17 16:27:43 +08:00
boyu0 0a53a12f51 issue #2771: update project setting 2013-09-17 14:31:43 +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
James Chen 650e6ad6fc issue #2087: [dispatcher] Updating MenuTest. 2013-09-17 10:46:31 +08:00
James Chen 365419a8b2 issue #2087: [dispatcher] Fix box2d_test crash. 2013-09-16 23:35:16 +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
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 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
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 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
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
James Chen 51548b9542 Adding NewEventDispatcher Test. 2013-09-13 16:38:21 +08:00
minggo c4cb2582cc fixed #2793:best practice of New Label 2013-09-13 11:46:46 +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
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
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
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 8a86a883d0 issue #2782: update mac version, update test case title 2013-09-09 21:33:01 +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
minggo c5b113c35e Merge pull request #3554 from ricardoquesada/fileutils_perf_improvements
Fileutils perf improvements
2013-09-08 19:50:12 -07:00
boyu0 1d47737f45 issue #2771: add physics files and entries. 2013-09-09 10:29:02 +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 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 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
Ricardo Quesada 02500372ed Adds new perf test: alloc / dealloc 2013-09-05 20:02:04 -07:00
Ricardo Quesada befcf722b6 compiles Linux / Windows 2013-09-03 10:17:25 -07:00
Ricardo Quesada 088a11ad0d Little performance improvements in SpriteBatchNode
_descendants: Array -> std::vector<Sprite*> since retain/release is no needed
Code is cleaner
Removes unused method (bug inherited from cocos2d-iphone)
Adds more doxygen strings
2013-09-02 16:44:25 -07:00
Ricardo Quesada be0c8cb1e8 adds two more perf tests
Node::addChild and Node::removeChild
2013-08-31 17:08:51 -07:00
Ricardo Quesada 0d96a0ce40 resets random seed before each test 2013-08-31 15:49:25 -07:00
Ricardo Quesada a5e0febc3e Adds better names to test
And new values for get(),add(),remove(),sort(),reorder()
2013-08-31 07:27:56 -07:00
Ricardo Quesada 5abb57e5f2 AddChild test fix
`sortAllChildren` should not be part of the test.
It is tested separatedly on another test
2013-08-31 06:59:44 -07:00
Ricardo Quesada c04409b6d5 More accurate test
Name is recalculated. No time is "wasted" in calculating it.

And `Visit` test uses `Node` objects instead of `Sprite`s. So `draw` is not taken into account, just the visit.

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-28 18:32:45 -07:00
Ricardo Quesada 7fb56bd123 Adds "Visit Scene Graph" tests
A new tests to measure the performance of visit

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-28 12:39:57 -07:00
James Chen a8140dd31b Adding test for issue http://www.cocos2d-x.org/issues/2401 . 2013-08-28 15:12:41 +08:00
James Chen b235bf07b7 [Mac] Adding WebsocketTest and SocketIOTest. 2013-08-28 15:02:57 +08:00
Ricardo Quesada 0093263c18 Little performance improvements
Uses `AffineTransform::IDENTITY`

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-26 18:08:21 -07:00
Ricardo Quesada ea8eb601af Uses std::sort()
Uses std::sort() for inserting the nodes.

This code is not final, but preliminary results show that std::sort() is 60% faster

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-24 10:56:07 -07:00
Ricardo Quesada 364288cf66 Adds "Sort all Children" perf test
Adds a new perf tests: "sortAllChildren"

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-23 13:14:57 -07:00
Ricardo Quesada 055c566bc9 Adds missing #include 2013-08-22 19:30:20 -07:00
Ricardo Quesada 38bfadf7f3 Adds 2 new performance tests
Invocation with `for_each()` and using `arrayMakeObjectsPerformSelector`

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-22 18:21:52 -07:00
minggo ddb4219d24 Merge pull request #3457 from boyu0/iss2434_gen_android_mk
closed #2434: Add android_mk_generator.py to generate Android.mk
2013-08-22 03:05:11 -07:00
boyu0 ad23ec4a0f #closed #2434: refactor LocalVarToAuto.py to use the PathUtils and fix some errors 2013-08-22 13:40:57 +08:00
Ricardo Quesada d7590affda Merge branch 'develop' into dictionary_array_fixes
Conflicts:
	cocos2dx/cocoa/CCArray.cpp
	cocos2dx/cocoa/CCArray.h
	cocos2dx/label_nodes/CCLabel.cpp
	extensions/CCArmature/datas/CCDatas.cpp
	extensions/CCArmature/display/CCDisplayManager.cpp
2013-08-21 21:27:44 -07:00
Ricardo Quesada 2e221ee6cc Array & Dictionary fixes
In many places `Dictionary` and `Array` are not being initialized. In fact `Dictionary` doesn't  have the `init()` method creating potential leaks.
Also in objects like `Armature` and the new `LabelTTF`, the `Array` object is not being used a pointer. So it doesn't use the 2 phase initialization, creating potential leaks.

This patch fixes all those issues.

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-21 20:12:09 -07:00
Ricardo Quesada f0a2f6cbf8 purge profiler data one + or - is pressed
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-21 20:02:50 -07:00
minggo 2de8963a0a fix warnings caused by deprecating some functions of Array 2013-08-22 10:45:47 +08:00
Ricardo Quesada cf02cb4581 Fixes names in Performance Node tests
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-20 18:05:35 -07:00
Ricardo Quesada e5551b2872 Compiles both with std::vector and ccCArray
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-20 16:06:51 -07:00
Ricardo Quesada 20167e2a12 removes unneeded spaces
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-20 14:18:45 -07:00
Ricardo Quesada c9b250d4a4 Adds new tests to tests
and enables profiling

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-20 14:18:32 -07:00
Ricardo Quesada 511ec1cc5d Compiles with improved CCArray
Compiles both with std::vector or ccCArray
2013-08-19 17:09:28 -07:00
minggo 3ca26e1aa6 Merge pull request #3430 from boyu0/iss2517_update_local_var_to_auto
closed #2517: Update all test cases use auto for local variables
2013-08-17 01:12:48 -07:00
minggo c7f313419e Merge pull request #3431 from minggo/iss2525-add_iterator_for_array
add iterator for Array and make Array can be used in range-based loop
2013-08-17 00:42:42 -07:00
minggo baa9e0a1e4 issue #2525:add iterator for Array and make Array can be used in range-based loop 2013-08-16 18:23:41 +08:00
boyu0 70df1a6061 closed #2517: Use LocalVarToAuto.py to change Samples src file 2013-08-16 16:05:27 +08:00
godyZ 424b4140a2 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Atitc_decode 2013-08-16 11:14:47 +08:00
godyZ e8809b2b15 issue #2533:add ATITC compressed texture support
soft decode test in Win32, ios, Mac. device decode test in HTC G14
Adreno 220 GPU.
2013-08-16 11:02:44 +08:00
James Chen 56cd039b32 issue #2488: Adding "啊" letter at the end of string to make VS2012 happy, otherwise VS will generate errors like "Error 3 error C2146: syntax error : missing ')' before identifier 'label'"; 2013-08-15 21:39:47 +08:00
carlo morgantini 47be4ff58a Merge remote-tracking branch 'originGithub/develop' into new_develop_merge_clean
Conflicts:
	cocos2dx/label_nodes/CCFontAtlas.cpp
	cocos2dx/label_nodes/CCFontAtlas.h
	cocos2dx/label_nodes/CCFontAtlasCache.cpp
	cocos2dx/label_nodes/CCFontAtlasFactory.cpp
	cocos2dx/label_nodes/CCFontAtlasFactory.h
	cocos2dx/label_nodes/CCFontDefinition.cpp
	cocos2dx/label_nodes/CCFontFreeType.cpp
	cocos2dx/label_nodes/CCLabel.cpp
	cocos2dx/label_nodes/CCLabel.h
	cocos2dx/label_nodes/CCStringBMFont.h
	cocos2dx/label_nodes/CCStringTTF.cpp
	samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp
2013-08-13 11:28:54 -07:00
carlo morgantini 15ec303278 more clean ups on tests for label 2013-08-13 10:12:02 -07:00
carlo morgantini 35b5e30190 alignment added to new label creation 2013-08-12 15:41:29 -07:00
carlo morgantini d15d84c05f samples cleaned up 2013-08-12 15:09:28 -07:00
carlo morgantini 097a5c488a New Label tests plus bug fixing 2013-08-12 13:29:54 -07:00
godyZ fa7b486880 update s3tc #5, code standardization 2013-08-09 12:54:05 +08:00
godyZ cd8430f81a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Conflicts:
	cocos2dx/Android.mk
	cocos2dx/platform/CCImage.h
	cocos2dx/platform/CCImageCommon_cpp.h
	cocos2dx/textures/CCTexture2D.h
	scripting/javascript/bindings/generated
2013-08-08 10:19:09 +08:00
godyZ 02419ccb00 update s3tc #3 ,android test 2013-08-06 15:33:38 +08:00
boyu0 dc6503f7d4 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2345_refactor_ccimage 2013-08-06 13:37:38 +08:00
godyZ 195536097f update s3tc #2 2013-08-06 11:52:48 +08:00
godyZ fd7b00681f update s3tc#1 2013-08-06 11:19:45 +08:00
James Chen 5ee6e7d79a Merge branch 'develop' into carlomorgantinizynga-new_develop_merge
Conflicts:
	cocos2dx/Android.mk
2013-08-05 10:09:15 +08:00
carlo morgantini 4904e0f31f Clean up (as requested by code review) 2013-08-01 17:08:57 -07:00
carlo morgantini 2fb2916bae some more cleanup 2013-08-01 14:36:34 -07:00
boyu0 93aa3c7ada issue #2345: refract CCImage and CCTexture2D. 2013-08-01 15:53:52 +08:00
Huabing.Xu 9a9d0b9def closed #2423: add ActionTargetedReverse test case 2013-08-01 10:28:18 +08:00
carlo morgantini b2579987e5 Merge remote-tracking branch 'cocos2d/develop' into new_develop_merge
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
	cocos2dx/include/ccTypes.h
	samples/samples.xcodeproj/project.pbxproj
2013-07-31 13:58:25 -07:00
minggo 0530109a9f Merge pull request #3178 from boyu0/2345
Refactor CCImage and CCTexture2D
2013-07-31 01:21:18 -07:00
carlo morgantini ff56ad5435 fix bugs with new Label stuff and add new sample for unicode 2013-07-30 16:41:26 -07:00
carlo morgantini 9de1ef3f97 New label TTF. New text alignment sample. 2013-07-30 10:27:22 -07:00
Huabing.Xu 6a1938056c closed #2447: Fix clippingNodeTest RawStencilBufferTest6 crash bug 2013-07-30 16:27:13 +08:00
boyu0 afde1e57b2 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 and fix the per premultipied tag 2013-07-30 11:10:05 +08:00
carlo morgantini 023b46154f Fix problems with missing glyphs in .ttf file 2013-07-29 13:43:23 -07:00
boyu0 894584e5a0 Add texture2D convert test and fix the convert bugs 2013-07-29 17:34:33 +08:00
Huabing.Xu 0dcf9e88c3 close #2437: replace stencil mechanism with a new approach by removing glColorMask call 2013-07-29 14:13:36 +08:00
Huabing.Xu 4ebfc1c6e4 issue #2437: Fix Bug RenderTextureTestDepthStencil not clipped by stencil 2013-07-29 14:11:21 +08:00
minggo 92f9ed743a use correct type to initialize an array 2013-07-28 23:23:35 +08:00
samuele3hu cc95fcaa69 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DrawNode 2013-07-28 14:35:38 +08:00
samuele3hu 3aeefb51b3 Modify deprecated CCPhysicsDebugNode typedef and some test bug 2013-07-28 14:33:02 +08:00
minggo e97b2504ea fix a logical error 2013-07-28 10:22:12 +08:00
James Chen e66e429bb2 issue #2430: Moving enum type to class for CCBReader. 2013-07-27 21:44:49 +08:00
James Chen 324607c32c More warning fixes. 2013-07-27 15:15:54 +08:00
carlo morgantini 6e4aafdacf fix a problem with the new Label and colors 2013-07-26 16:30:36 -07:00
carlo morgantini 23575f0a68 New Label stuff merged and Label::Alignment replaced with TextVAlignment and TextHAlignment 2013-07-26 16:04:21 -07:00
carlo morgantini 8416e7cf6d Merge remote-tracking branch 'cocos2d/develop' into developNewLabelMergeDevelop
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
	scripting/javascript/bindings/generated
	tools/bindings-generator
2013-07-26 15:54:50 -07:00
Ricardo Quesada 0da367e05e fixes warnigns when using HttpRequest
fixes warnigns when using HttpRequest
2013-07-26 14:34:17 -07:00
carlo morgantini be47a6da52 Merge remote-tracking branch 'ricorigin/label_merge' into developNewLabelForRiq
Conflicts:
	cocos2dx/label_nodes/CCFontAtlasFactory.cpp
	samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp
2013-07-26 11:58:18 -07:00
carlo morgantini 76ebeb0676 some more clean up for CCLabel 2013-07-26 10:29:29 -07:00
James Chen 58a3560bca More enum class: ScrollView::Direction, TableView::VerticalFillOrder 2013-07-26 22:55:41 +08:00
James Chen dc7fcce0fe Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into minggo-iss2430-modify_enum
Conflicts:
	scripting/javascript/bindings/generated
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-07-26 21:22:16 +08:00
James Chen e16a5f469b issue #2430: Refactoring enum 'ResolutionPolicy'. 2013-07-26 18:18:58 +08:00
minggo 3cb40b36e4 issue #2430:fix some errors 2013-07-26 18:07:40 +08:00
minggo a7c1904eb8 issue #2430:move EditBox enum into class 2013-07-26 17:45:01 +08:00
James Chen ad1d8b667d enum class for LanguageType, Application::Platform 2013-07-26 17:29:06 +08:00
James Chen 54ab99bf74 enum class for ProgressTimer::type 2013-07-26 17:28:18 +08:00
minggo 0870581623 fix warnings 2013-07-26 15:22:45 +08:00
minggo f55d73194e issue 2430:use enum class for Control enum values 2013-07-26 14:37:26 +08:00
James Chen b57d48b0d2 ParticleSystem::MODE_RADIUS --> ParticleSystem::Mode::RADIUS 2013-07-26 13:47:30 +08:00
minggo 0b8de88ddc issue 2430:use enum class 2013-07-26 12:08:18 +08:00
Ricardo Quesada 8bf24f0475 ccGLXXX -> GL::xxx
Adds GL namespace. Deprecates the `ccGLFunctionName` functions. New functions are `GL::functionName`

Also, converts the class `DrawPrimitives` into a namespace
2013-07-25 18:42:53 -07:00
carlo morgantini 7d141a3f57 the new label system now uses only CCStringTTF (CCStringBMFont is still here, but not used anymore) 2013-07-25 17:58:13 -07:00
Ricardo Quesada 07c6c904cc Removes more Hungarian notation and more
Adds Touch::DispatchMode. Removes Layer::TouchDispatchMode
2013-07-25 16:27:24 -07:00
Ricardo Quesada 058935aa8d Removes Hungarian notation
Removes Hungarian notation from the code.
2013-07-25 15:53:24 -07:00
Ricardo Quesada d683e10808 More constant fixes
Transition::ORIENTATION_XXX -> Transition::Orientation::XXX
Image::FORMAT_XXX -> Image::Format::XXX
Image::_function() -> Image::function() // private methods should not start with '_'
DrawPrimitives::drawColor() -> DrawPrimitives::setDrawColor()

And fixes Premultiplied Alpha in PVR v3 images
And tests are updated with the new functions
2013-07-25 14:49:43 -07:00
Ricardo Quesada 16d0b43181 Constant fixes
Director::PROJECTION_2D, 3D,... -> Director::Projection::_2D, _3D, ...
Label::TEXT_ALIGNMENT_... -> Label::HAlignment::...
Label::TEXT_VERTICAL_ALIGNMENT_... -> Label::VAlignment::...
Texture2D::PIXEL_FORMAT_... -> Texture2D::PixelFormat::...
BlendFunc::BLEND_FUNC_DISABLE -> BlendFunc::DISABLE

Also adds more constant for BlendFunc
2013-07-25 13:36:19 -07:00
minggo 8b748e2992 issue #2430:use const member variable instead of macro 2013-07-25 21:04:32 +08:00
minggo 051caf5e54 issue #2430:move TransitionScene enum into class 2013-07-25 20:50:39 +08:00
minggo df48f52aa3 issue #2430:use Image::Format instead of tImageFormat 2013-07-25 20:38:15 +08:00
minggo 18a19d5168 issue #2430:move Layer enum into class 2013-07-25 20:12:55 +08:00
minggo beb192ecaa issue #2430:move Menu enum into class 2013-07-25 20:04:24 +08:00
minggo 77afae124b issue #2430:move Texture2D enum into class 2013-07-25 19:52:44 +08:00
minggo 2293630335 issue #2430:move enum in ccTypes.h class 2013-07-25 18:46:43 +08:00
minggo acdd1cfe9d issue #2430:move GLProgram enum into class 2013-07-25 17:48:22 +08:00
minggo 3d6f3bf8b2 issue #2430:move ProgressTimer enum into class 2013-07-25 15:11:36 +08:00
minggo 658bffbb69 issue #2430:use upper letter for enum item in ccGLStateCache.h 2013-07-25 15:04:13 +08:00
minggo 8dab462f6f issue #2430:move Director enum into class 2013-07-25 14:39:32 +08:00
minggo edcea3eb8d issue #2430:move more Particle enum into class 2013-07-25 14:27:46 +08:00
minggo 4519a09ce4 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2430-modify_enum 2013-07-25 13:54:55 +08:00
minggo 4bfe6c2439 issue #2430:move Particle enum into class 2013-07-25 13:54:32 +08:00
James Chen 306587167d Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2404-ext-deprecated
Conflicts:
	AUTHORS
2013-07-25 11:28:48 +08:00
Ricardo Quesada a7760d117d Adds more tests 2013-07-24 17:21:51 -07:00
Ricardo Quesada e0523b3438 Merge branch 'developNewLabelForRiq' into label_merge
Conflicts:
	cocos2dx/textures/CCTexture2D.h
	samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp
	scripting/javascript/bindings/generated
	tools/bindings-generator
2013-07-24 15:15:08 -07:00
Ricardo Quesada 943b805bc8 Fixes some warnings
... and updates the version to pre-alpha0
2013-07-24 14:02:36 -07:00
carlo morgantini 97363c9382 some more cleanup and refactory for the new Label stuff 2013-07-24 10:22:46 -07:00
James Chen e0f9ac82da issue #2404: Updating ExtensionsTest/CocosBuilderTest. 2013-07-24 18:17:20 +08:00
Ricardo Quesada 1f37d4d00a More best practices fixes and other bug fixes
- Adds `CC_REQUIRES_NULL_TERMINATION` to methods that require a NULL at the end
- Removes more Hungarian notations in samples
- s/sprite/scene: fix from previous commit
- `CCLog` -> `log`
- `getLayerNamed` -> `getLayer`
- `getPropertyNamed` -> `getProperty`
- and other small fixes
2013-07-23 15:20:22 -07:00
Ricardo Quesada 2013f841ad Merge branch 'develop' into more_best_practices_fixes 2013-07-23 13:36:22 -07:00
James Chen 12bb640307 issue #2378: ParticleTest: _emitter->getOpacityModifyRGB --> _emitter->isOpacityModifyRGB 2013-07-23 20:47:19 +08:00
minggo f6cfe3007f issue #2412:fix merging conflict 2013-07-23 10:41:11 +08:00
Ricardo Quesada c158cd5be6 More best practices fixes
- Removes Hungarian notation from the CPP test (there are still some Hungarian to remove)
- Label and MotionStreak: Uses the CL() entry for the tests (lambda functions)
2013-07-22 17:25:44 -07:00
carlo morgantini 98bb0c26f3 working on the new label stuff 2013-07-22 14:43:45 -07:00
carlo morgantini 98c52cd98d new FontCache 2013-07-22 13:08:37 -07:00
carlo morgantini 5668607e0e merging with Ricardo stuff and fixin the new Label 2013-07-22 11:40:39 -07:00
James Chen b58d18e20a More unsinged int -> int in some places where it could be difficult to find underflow bugs. And some warnings fix. 2013-07-22 14:28:19 +08:00