341178cb91
Removes unneeded log
...
This log is already part of `CCConfiguration`
2013-09-25 13:03:47 -07:00
261f0e4f05
rename some files
2013-09-21 14:40:54 +08:00
4c9771ba3c
rename some class names to obey cocos2d-x coding style
2013-09-20 19:19:31 +08:00
e697b0fc0b
issue #2087 : Updating the constructor of XXXEvent.
2013-09-18 18:16:14 +08:00
768828ec29
add term logic of application to prevent memory leak (for desktop such as linux, mac, windows)
2013-09-18 17:16:31 +08:00
cdcfda1f2c
issue #2087 : [dispatcher] Removing unused codes.
2013-09-17 17:00:37 +08:00
c726765b4a
closed #2745 : fix bug: _dataLen not set at Image::initWithString() and Image::initWithStringShadowStroke()
2013-09-16 17:13:44 +08:00
e4f8929898
Merge pull request #3606 from dabingnn/issue_2808_glfw_bug_enhancement
...
Issue 2808 glfw bug enhancement
2013-09-15 20:18:02 -07: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
0af0951c35
issue #2808 : refractor setFrameZoomFactor() access, change init() parameter
2013-09-13 18:21:12 +08:00
86306a842d
issue #2808 : 1. retina support 2. frameZoomFactor
2013-09-13 18:09:11 +08:00
5f1e5c505c
issue #2808 : when move window, set OpenGL viewport again
2013-09-13 17:11:35 +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
da1101beeb
[Dispatcher] New event dispatcher, first commit.
2013-09-11 22:09:34 +08:00
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
99f88df8d2
issue #2460 : optimize EGLView interface
2013-08-29 11:36:16 +08:00
4af0a418fe
issue #2460 : glfw mac keyboard input
2013-08-28 16:25:03 +08:00
e935481361
Merge branch 'develop' into Iss2460-glfw-refractor
...
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
cocos2dx/platform/mac/CCEGLView.mm
samples/Cpp/TestCpp/proj.linux/main.cpp
samples/Cpp/TestCpp/proj.win32/main.cpp
2013-08-28 13:42:22 +08:00
ca78d2d129
closed #2650 : Remove ccTypeInfo since we could get the hash value from *typeid(T).hash_code()* if using c++11.
2013-08-22 18:16:50 +08: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
4104cdc20e
Better destructors logs
...
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-21 20:08:51 -07:00
1ee7790f0e
Initializing Array after it was constructed.
2013-08-22 10:15:47 +08:00
b2e167c6ea
issue #2460 : glfw mac version
2013-08-21 12:01:56 +08:00
9a9ffaeb4d
issue #2170 : A typo fix.
2013-08-05 11:33:59 +08:00
5ed8deb9a6
Fixed more documentation errors.
...
Modified mismatching parameters doc caused by refactoring.
Added the missing doc of some parameters.
Fixed incorrect use of doxygen tags.
Removed Hungarian notation from parts of the code.
Replaced 1 tab character with 4 spaces.
2013-08-01 20:55:43 +08:00
304d636deb
Closed #2345 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345
2013-07-29 11:40:18 +08:00
cecfc13bc4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345
2013-07-27 22:06:30 +08:00
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
a73a4b9837
Merge pull request #3276 from dumganhar/constants-refactor
...
Enumeration refactoring
2013-07-26 05:36:16 -07:00
c9def73930
Application::Platform::OS_MACOS --> Application::Platform::OS_MAC.
2013-07-26 20:24:33 +08:00
3ffc026c6c
Added some guards in file utils.
2013-07-26 14:19:20 +02:00
2f8d3587bd
Platform::LINUX --> Platform::OS_LINUX, Platform::ANDROID --> Platform::OS_ANDROID. ANDROID is defined by ndk.
2013-07-26 18:17:30 +08:00
ad1d8b667d
enum class for LanguageType, Application::Platform
2013-07-26 17:29:06 +08:00
0870581623
fix warnings
2013-07-26 15:22:45 +08: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
4caea01021
Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into iss2430-modify_enum
2013-07-25 23:09:56 +08:00
b36a4f1df0
issue #2430:use upper letters for enum item in Image
2013-07-25 23:09:18 +08:00
3f36e8300e
issue #2430 : Fixing compilation errors for Mac and JSB projects.
2013-07-25 21:59:47 +08:00
a2b611d8c3
Refactor Image and Texture2D, combine TexturePVR to Image and Texture2D, and delete TexturePVR
2013-07-25 21:35:00 +08:00
77afae124b
issue #2430:move Texture2D enum into class
2013-07-25 19:52:44 +08:00
35dec5d71e
More CCLog --> log.
2013-07-24 10:46:13 +08:00
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
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
948acd6e29
Refactor CCTexture2D and CCImage
2013-07-19 15:37:54 +08:00
76e05ee802
Merge https://github.com/cocos2d/cocos2d-x into 2345
2013-07-18 17:47:43 +08:00
6277ae191b
issue #2404 : Removing duplicated codes in platform/mac/CCImage.mm.
2013-07-18 13:40:32 +08:00
Ricardo Quesada