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
James Chen
a76f556fb2
[emscripten] Fixing compilation errors.
2013-07-29 16:33:34 +08:00
James Chen
343c98af13
Fixing warnings of the order of member variables and fixing errors for tizen projects.
2013-07-29 14:07:57 +08:00
boyu0
304d636deb
Closed #2345 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345
2013-07-29 11:40:18 +08:00
minggo
9780b75da8
Merge pull request #3273 from thp/develop-qt5
...
Port Cocos2D-X to Qt 5 (develop branch)
2013-07-28 16:51:55 -07:00
minggo
f7fd7a8af5
fixed warnings on Android and windows
2013-07-28 21:43:20 +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
4f6e1fb944
set _isDownloading to false before return
2013-07-28 09:53:59 +08:00
James Chen
d67ab3e4cc
Untabify for CCBValue.cpp.
2013-07-28 00:31:09 +08:00
James Chen
ab84dacf8f
issue #2430 : CCBValue::Type is strong enum type now.
2013-07-28 00:26:24 +08:00
James Chen
584402984b
Adding deprecated constants for CCBReader.
2013-07-27 23:04:14 +08:00
James Chen
fa5c26c5e2
member variables renaming according cocos2d-x style.
2013-07-27 22:31:57 +08:00
boyu0
cecfc13bc4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345
2013-07-27 22:06:30 +08:00
James Chen
e66e429bb2
issue #2430 : Moving enum type to class for CCBReader.
2013-07-27 21:44:49 +08:00
James Chen
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
James Chen
387ae822b1
issue #2430 : Compilation error fix for CCEditBox/CCEditBoxImplWin.cpp
2013-07-26 22:57:15 +08:00
James Chen
58a3560bca
More enum class: ScrollView::Direction, TableView::VerticalFillOrder
2013-07-26 22:55:41 +08:00
James Chen
2bfccb4a43
A typo fix: EditBox::EditBox::KeyboardReturnType --> EditBox::KeyboardReturnType
2013-07-26 21:36:32 +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
6c2e6e8cb0
Merge pull request #3253 from metalbass/patch-3
...
Added virtual destructors to some interfaces to fix issue 3095
2013-07-26 05:47:35 -07:00
minggo
3cb40b36e4
issue #2430:fix some errors
2013-07-26 18:07:40 +08:00
minggo
859da78499
Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into iss2430-modify_enum
2013-07-26 17:47:52 +08:00
minggo
a7c1904eb8
issue #2430:move EditBox enum into class
2013-07-26 17:45:01 +08:00
Thomas Perl
2f35353020
Qt 5 port: Fixes to build against "develop" branch
...
The Qt 5 port was based on the "master" branch. This patch
updates all Qt 5 changes to build correctly with the "develop"
branch. Tested with GCC 4.6 and Qt 5.1.0 on Linux.
2013-07-26 08:55:46 +00:00
minggo
0b3ed85914
issue #2430:fix some compiling error
2013-07-26 16:43:40 +08:00
minggo
bafc01c2aa
issue 2430:fix a compiling error and add missing cpp
2013-07-26 15:55:12 +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
7839f769f2
Merge pull request #3265 from dumganhar/constants_fixes
...
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3261 and updating bindings-generator. It supports 'enum class' type now.
2013-07-25 23:21:29 -07:00
minggo
0b8de88ddc
issue 2430:use enum class
2013-07-26 12:08:18 +08:00
minggo
f94a02ac01
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2430-modify_enum
2013-07-26 11:25:18 +08:00
James Chen
d882fc3ef0
Merge pull request #3263 from 2youyouo2/Fix_3.0
...
Fix armature supper fast
2013-07-25 19:58:22 -07:00
2youyou2
7c4460f9e0
Fix armature supper fast
2013-07-26 10:19:19 +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
Ricardo Quesada
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
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
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
323af3c889
issue #2430:use upper letters for enum item in AssetsManager and WebSocket
2013-07-25 22:29:12 +08:00
boyu0
a2b611d8c3
Refactor Image and Texture2D, combine TexturePVR to Image and Texture2D, and delete TexturePVR
2013-07-25 21:35:00 +08:00
minggo
18a19d5168
issue #2430:move Layer enum into class
2013-07-25 20:12:55 +08:00
minggo
77afae124b
issue #2430:move Texture2D enum into class
2013-07-25 19:52:44 +08:00
metalbass
2982a42fbf
Fixed typo. virutal -> virtual
2013-07-25 13:03:40 +02:00
metalbass
c7329e9301
Added virtual destructors to some interfaces to fix issue 3095
2013-07-25 12:54:51 +02: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
James Chen
477dd6c3c7
issue #2404 : cocos-ext include WebSocket.h and SocketIO.h now. WebSocket.h doesn't depend on <libwebsockets.h> now.
2013-07-25 10:33:19 +08:00