365419a8b2
issue #2087 : [dispatcher] Fix box2d_test crash.
2013-09-16 23:35:16 +08:00
36bfb24d29
issue #2087 : [dispatcher] Adding remove all event listener method in Node, removed unused codes.
2013-09-16 22:20:01 +08: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
5dffb1b44e
Deprecated methods are replaced (warning MSVC C4996 is suppressed).
2013-09-16 15:38:03 +03:00
499e8caf7a
[dispatcher] Updating the declare of event listeners in Layer. Using more specified type.
2013-09-15 17:48:29 +08:00
997a5a36c1
[dispatcher] Renaming 'registerEventListenerXXX' to 'addEventListenerXXX'.
2013-09-14 09:02:49 +08: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
5ddd9ae23c
issue #2784:Delete class destuctor js-binding and lua-binding document
2013-09-13 13:52:42 +08:00
a34ec99014
issue #2784:Add js-binding and lua-binding document
2013-09-13 11:41:20 +08:00
57b0a66bda
[dispatcher] Removing Layer::setTouchPriority since it's not needed.
2013-09-12 21:11:47 +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
9b352d5ff4
Merge remote-tracking branch 'parent/develop' into develop
...
merged from parent
2013-08-26 21:36:38 +09:00
1beea771b4
type
2013-08-26 20:42:41 +09:00
f0620b0e85
add overrode init method for LayerMultiplex
2013-08-26 20:38:23 +09:00
2de8963a0a
fix warnings caused by deprecating some functions of Array
2013-08-22 10:45:47 +08:00
7e3d3b3d3e
Merge pull request #2950 from zcgit/develop
...
a potential bug in Layer.
2013-08-19 19:02:53 -07:00
978fc634be
Use C++ code in C++ comments.
...
Removed Hungarian notation from parts of the code.
2013-08-01 16:40:56 +08:00
3bc45e665c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into constants-refactor
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-07-26 19:56:04 +08:00
54ab99bf74
enum class for ProgressTimer::type
2013-07-26 17:28:18 +08:00
6b9c7d4ade
issue #2404:modify a function name to isSwallowsTouches()
2013-07-26 15:21:19 +08:00
fae8e253c0
issue #2404:Modify tab to spaces
2013-07-26 15:06:35 +08:00
273bdc8fbd
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprectedOperator
2013-07-26 14:35:40 +08:00
2288280b2d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprectedOperator
2013-07-26 13:57:11 +08:00
f49277d367
issue #2404:replace deprecated functions in testlua and hellolua sample
2013-07-26 13:43:28 +08:00
4772674ff4
Removes Layer::TouchesDispatchMode...
...
...since it is declared in Touch::DispatchMode
2013-07-25 19:06:32 -07: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
191aaebe2a
More const fixes
...
`Menu::STATE_XXX` -> `Menu::State::XXX`
Removes more Hungarian notation
Removes Configuration::Type <- I added it a few months ago, and it was not being used. It is safe to remove it
2013-07-25 17:47:42 -07:00
07c6c904cc
Removes more Hungarian notation and more
...
Adds Touch::DispatchMode. Removes Layer::TouchDispatchMode
2013-07-25 16:27:24 -07:00
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
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
4d7ac6c800
issue #2430:fix conflict
2013-07-25 21:37:12 +08:00
051caf5e54
issue #2430:move TransitionScene enum into class
2013-07-25 20:50:39 +08:00
18a19d5168
issue #2430:move Layer enum into class
2013-07-25 20:12:55 +08:00
11d7c9c653
issue #2404:Add more functions to Deprecated.lua and modify some .pkg files
2013-07-25 19:58:59 +08:00
acdd1cfe9d
issue #2430:move GLProgram enum into class
2013-07-25 17:48:22 +08:00
3d6f3bf8b2
issue #2430:move ProgressTimer enum into class
2013-07-25 15:11:36 +08:00
658bffbb69
issue #2430:use upper letter for enum item in ccGLStateCache.h
2013-07-25 15:04:13 +08:00
baed1c5b48
issue #2378 : More override functions.
2013-07-23 21:51:19 +08:00
a1c4c73c1c
issue #2378 : More setter/Getter, removing CC_PROPERTY_XXX macros.
2013-07-23 18:26:26 +08:00
1db847ad7c
issue #2344 : ScriptEngineManager::sharedManager --> ScriptEngineManager::getInstance, ScriptEngineManager::purgeSharedManager --> ScriptEngineManager::destroyInstance
2013-07-22 17:24:54 +08:00
2228614748
issue #2344 : JSB also uses 'ScriptEngineManager::sharedManager()->getScriptEngine()->sendEvent(XXX);' now.
2013-07-22 17:12:53 +08:00
89d210bdb3
CCAssert -> CCASSERT
...
and other best pracitces like:
capacity and "index" are ints and not unsigned int (google's recomendation).
It is easier to detect underflow bugs like this
plus other minor improvements
2013-07-19 22:01:27 -07:00
1f0dac4ed0
Removes CC_PROPERTY / CC_SYNTHESIZE from some parts of the code
...
As agreed previously, CC_PROPERTY_XXX and CC_SYNTHESIZE_XXX should
not be used in the code.
This patch removes some of them. There are still many more to remove
2013-07-19 13:16:38 -07:00
a425dd3dc0
Merge branch 'more_best_practices_fixes' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-more_best_practices_fixes
...
Conflicts:
cocos2dx/actions/CCActionTiledGrid.h
2013-07-18 15:46:14 +08:00
6e25301b43
more best practices fixes
...
- Adds more `const` in getters
- Overriden methods have the `override` keyword
- Reorganizes the structure of the class:
# creators first, then constructor, destructors, init
# then overridden methods
# variables at the end
- removes Hungarian notation from parts of the code
2013-07-17 16:56:19 -07:00
f4edc7a922
closed #2413 : Warning fixes for overload virtual functions.
2013-07-17 16:25:13 +08:00
241c01bec3
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler
2013-07-16 14:47:46 +08:00
1761669832
issue #2377:Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandlerMgr
2013-07-16 12:47:40 +08:00
James Chen