James Chen
e16a5f469b
issue #2430 : Refactoring enum 'ResolutionPolicy'.
2013-07-26 18:18:58 +08:00
James Chen
2f8d3587bd
Platform::LINUX --> Platform::OS_LINUX, Platform::ANDROID --> Platform::OS_ANDROID. ANDROID is defined by ndk.
2013-07-26 18:17:30 +08: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
7817dd6c0f
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2430-modify_enum
2013-07-26 17:45:24 +08:00
minggo
a7c1904eb8
issue #2430:move EditBox enum into class
2013-07-26 17:45:01 +08:00
boyu0
02bdfbf169
Combine CCTextureETC to CCImage and CCTexture2D.
2013-07-26 17:34:44 +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
James Chen
6ff6aa20b1
Merge pull request #3271 from natural-law/develop
...
Update class ProtocolAds to compatible with more Ads SDKs.
2013-07-26 02:23:48 -07: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
zhangbin
f847bf4757
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-07-26 16:11:11 +08:00
zhangbin
4ea5d0509f
Update the JS binding for the change of class ProtocolAds.
2013-07-26 16:07:30 +08:00
minggo
bafc01c2aa
issue 2430:fix a compiling error and add missing cpp
2013-07-26 15:55:12 +08:00
zhangbin
bbe649812a
Update class ProtocolAds to compatible with more Ads SDKs.
2013-07-26 15:51:06 +08:00
metalbass
5183803784
Removed delete from CC_SAFE_DELETE and changed 0 to nullptr on all CC_SAFE macros
...
This implements this issue: https://github.com/cocos2d/cocos2d-x/issues/3099
I've also change all pointer assignments to 0 to assignments to nullptr on the CC_SAFE macros.
Also aligned them for better readability :)
2013-07-26 09:33:40 +02:00
minggo
0870581623
fix warnings
2013-07-26 15:22:45 +08:00
samuele3hu
6b9c7d4ade
issue #2404:modify a function name to isSwallowsTouches()
2013-07-26 15:21:19 +08:00
samuele3hu
fae8e253c0
issue #2404:Modify tab to spaces
2013-07-26 15:06:35 +08:00
samuele3hu
b6256be1ad
issue #2404:del a deprecated func
2013-07-26 15:01:31 +08:00
minggo
f55d73194e
issue 2430:use enum class for Control enum values
2013-07-26 14:37:26 +08:00
samuele3hu
0f8d10f9a7
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprectedOperator
2013-07-26 14:36:50 +08:00
samuele3hu
273bdc8fbd
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprectedOperator
2013-07-26 14:35:40 +08:00
James Chen
ea3858fdf2
Merge pull request #3267 from CocosRobot/updategeneratedsubmodule_1374820049
...
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-25 23:30:14 -07:00
CocosRobot
97f17913a6
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-26 06:27:41 +00: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
James Chen
00c2173009
Warning fix in CocosDenshion.vcxproj
2013-07-26 14:16:26 +08:00
James Chen
6c00a51517
RELATIVE was defined on windows, un-define it.
2013-07-26 14:16:12 +08:00
James Chen
2abd61b967
Warning fix in CCRenderTexture.h.
2013-07-26 14:15:19 +08:00
James Chen
9ae7bd33e2
typedef enum Director::Projection ccDirectorProjection; can't work on Windows, since Director::Projection is already a type, no need to add enum.
2013-07-26 14:14:55 +08:00
samuele3hu
deada04d7f
issue #2404:replace some deprecated enums using in the lua
2013-07-26 14:10:45 +08:00
James Chen
d345ac7f3f
[Android] Usage changes: ccGLInvalidateStateCache --> GL::invalidateStateCache();
2013-07-26 14:00:10 +08:00
James Chen
5dca03c061
Fixing compilation errors in CCImageCommon_cpp.h.
2013-07-26 13:59:27 +08:00
James Chen
df8273d960
Fixing an issue that wrong implementation in 'ccGLDeleteTextureN'.
2013-07-26 13:58:59 +08:00
samuele3hu
2288280b2d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprectedOperator
2013-07-26 13:57:11 +08:00
James Chen
241cf022a4
Fixing Luabinding errors.
2013-07-26 13:50:10 +08:00
James Chen
8459376f3d
More deprecated definitions.
2013-07-26 13:49:49 +08:00
James Chen
4f9d0672aa
Fixing errors when disabling VAO.
2013-07-26 13:49:24 +08:00
James Chen
37f6685894
MODE_GRAVITY --> Mode::GRAVITY, POSITION_TYPE_XXX --> PositionType::XXX
2013-07-26 13:48:32 +08:00
James Chen
b57d48b0d2
ParticleSystem::MODE_RADIUS --> ParticleSystem::Mode::RADIUS
2013-07-26 13:47:30 +08:00
samuele3hu
f49277d367
issue #2404:replace deprecated functions in testlua and hellolua sample
2013-07-26 13:43:28 +08:00
minggo
a16fd40a1b
Merge pull request #3266 from timothyqiu/docfix
...
Documentation fix: use \p to reference a parameter
2013-07-25 21:46:09 -07:00
minggo
0b8de88ddc
issue 2430:use enum class
2013-07-26 12:08:18 +08:00
Timothy Qiu
d1e46940ab
Documentation fix: use \p to reference a parameter
...
The orginal @param is meant to describe a parameter, resulting in a
strange doc output.
2013-07-26 12:04:03 +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
minggo
e0e9a6f796
Merge pull request #3264 from minggo/releasing
...
use one template for multi-platforms
2013-07-25 20:24:18 -07:00
James Chen
cda727843a
Updating bindings-generator. It supports 'enum class' type now.
2013-07-26 11:14:48 +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
minggo
5479dbe0b9
remove xcode template
2013-07-26 10:54:20 +08:00