4c9771ba3c
rename some class names to obey cocos2d-x coding style
2013-09-20 19:19:31 +08:00
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
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
ca599b4852
Merge guy to 3.0 branch
2013-09-16 20:54:13 +08:00
5dffb1b44e
Deprecated methods are replaced (warning MSVC C4996 is suppressed).
2013-09-16 15:38:03 +03:00
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
d8bd65b2e8
issue #2784:Add class constructor js-binding document
2013-09-13 16:46:31 +08:00
a34ec99014
issue #2784:Add js-binding and lua-binding document
2013-09-13 11:41:20 +08:00
c90291e01d
ScrollView::_touches is std::vector now, so it should not be inited by NULL pointer.
2013-09-12 21:02:30 +08:00
6f37529236
[dispatcher] Adding 'Node::updateEventPriorityIndex' and making 'Node::addEventId(removeEventId)' method to be private.
2013-09-12 20:47:15 +08:00
6a2536b5bd
[Dispatcher] Fixing logic errors in CCScrollView after using EventDispatcher.
2013-09-12 16:03:03 +08:00
5d95711865
[EventDispatcher] Fixing compilation error after changing of Touch(It doesn't inherit from Object).
2013-09-12 14:42:56 +08:00
da1101beeb
[Dispatcher] New event dispatcher, first commit.
2013-09-11 22:09:34 +08:00
b8c82ae5a9
[develop] Warning fixes.
2013-09-08 11:26:38 +08:00
c4a97cdfa1
Merge pull request #3485 from ricardoquesada/perf_and_bug_fixes
...
Perf and bug fixes
2013-08-26 23:22:33 -07:00
0093263c18
Little performance improvements
...
Uses `AffineTransform::IDENTITY`
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-26 18:08:21 -07:00
3b90d0b5b6
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
2013-08-22 13:40:35 +08:00
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
d9da52ce86
Merge pull request #3454 from minggo/array-support-sort
...
Array can be use in stl::sort() when not using vector inside
2013-08-21 20:50:03 -07:00
a3eb0a058e
Merge branch 'develop' into dictionary_array_fixes
...
Conflicts:
cocos2dx/platform/mac/CCFileUtilsMac.mm
extensions/CCBReader/CCBAnimationManager.cpp
extensions/CCBReader/CCBReader.cpp
extensions/CCBReader/CCBSequenceProperty.cpp
extensions/GUI/CCScrollView/CCScrollView.cpp
2013-08-21 20:27:19 -07:00
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
27c59a799d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
2013-08-22 11:01:38 +08:00
2de8963a0a
fix warnings caused by deprecating some functions of Array
2013-08-22 10:45:47 +08:00
3cb095f48a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
2013-08-22 10:17:59 +08:00
1ee7790f0e
Initializing Array after it was constructed.
2013-08-22 10:15:47 +08:00
d2684338a5
Update CCScrollView.cpp
...
change release mode
2013-08-20 14:58:26 +08:00
f97f7edeb6
Merge pull request #3440 from ricardoquesada/better_array
...
Better array
2013-08-19 23:39:36 -07:00
39686ea503
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
2013-08-20 13:46:26 +08:00
7e3d3b3d3e
Merge pull request #2950 from zcgit/develop
...
a potential bug in Layer.
2013-08-19 19:02:53 -07:00
511ec1cc5d
Compiles with improved CCArray
...
Compiles both with std::vector or ccCArray
2013-08-19 17:09:28 -07:00
175316f2c6
Merge pull request #3404 from timothyqiu/docfix
...
Documentation fix: broken links and wrong encoding in the doc...
2013-08-18 19:35:47 -07:00
c8b75a1080
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
2013-08-16 10:13:38 +08:00
7f8099ce69
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
...
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
tools/bindings-generator
2013-08-15 16:21:32 +08:00
13fd369beb
issue #2433:Modify lua binding generator template and releated action test
2013-08-14 21:35:55 +08:00
86fef75963
issue #2521 : Removing an unused method ControlStepper::setValue(double value, bool send); since it's not implemented and there is an similar method 'setValueWithSendingEvent' could replace it.
2013-08-12 11:20:48 +08:00
fc437c5ef4
(Array*) --> static_cast<Array*>() for CCControl.cpp.
2013-08-09 10:56:39 +08:00
3c394da6a4
Changed two 'XXX class for cocos2d for iphone'.
2013-08-09 02:31:51 +08:00
3d8d0e40ee
Fixed broken links and wrong encoding in the doc.
...
Fixed Obj-C names when referening functions.
Changed some GB2312 encoded characters to UTF-8.
2013-08-09 02:31:51 +08:00
5ad5cfed7a
Yet another documentation fix.
...
Modified mismatching parameters doc caused by refactoring.
Added the missing doc of some parameters.
Removed Hungarian notation from parts of the code.
2013-08-01 21:40:13 +08:00
343c98af13
Fixing warnings of the order of member variables and fixing errors for tizen projects.
2013-07-29 14:07:57 +08:00
e66e429bb2
issue #2430 : Moving enum type to class for CCBReader.
2013-07-27 21:44:49 +08:00
feadd2b2dd
issue #2430 : Moved constant to header file to avoid errors in 'switch case', the error is 'case value is not a constant expression'.
...
Also added more deprecated constants.
2013-07-27 00:55:41 +08:00
387ae822b1
issue #2430 : Compilation error fix for CCEditBox/CCEditBoxImplWin.cpp
2013-07-26 22:57:15 +08:00
58a3560bca
More enum class: ScrollView::Direction, TableView::VerticalFillOrder
2013-07-26 22:55:41 +08:00
2bfccb4a43
A typo fix: EditBox::EditBox::KeyboardReturnType --> EditBox::KeyboardReturnType
2013-07-26 21:36:32 +08:00
3cb40b36e4
issue #2430:fix some errors
2013-07-26 18:07:40 +08:00
a7c1904eb8
issue #2430:move EditBox enum into class
2013-07-26 17:45:01 +08:00
0870581623
fix warnings
2013-07-26 15:22:45 +08:00
f55d73194e
issue 2430:use enum class for Control enum values
2013-07-26 14:37:26 +08:00
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
minggo