minggo
cb271e21d8
issue #2404:fixed some compiling warnings
2013-07-15 17:51:36 +08:00
minggo
b97ea0815f
issue #2404:re-add some global functions and variables and mark them as deprecated
2013-07-15 16:42:31 +08:00
minggo
eada29ee40
issue #2404:created CCDprecated.h and move all global functions and variables into it
2013-07-15 16:14:26 +08:00
minggo
6abe6fce78
closed #2393 : fix conflicts
2013-07-12 18:04:32 +08:00
minggo
15096b0716
issue #2393:mark CCPointMake CCSizeMake CCRectMake as deprecated
2013-07-12 14:30:26 +08:00
Ricardo Quesada
cf262c28e2
getInstance() / destroyInstance() are used...
...
... instead of sharedXXX / purgeXXX.
They are more C++ friendly, and also easier to remember.
common files + Mac files + iOS files + tests/samples files were updated.
The old methods are deprecated now.
2013-07-11 15:24:23 -07:00
Éloi Rivard
05ae6f8518
Fixed some warnings
2013-07-09 16:33:21 +02:00
James Chen
a517e68c59
closed #2379 : Removing CCZone.h/.cpp.
2013-07-09 14:50:31 +08:00
minggo
87125e4b2a
issue #2129:use capital words for static const member variables
2013-07-08 18:11:32 +08:00
James Chen
16ec50e86b
issue #2129 : Adding explicit for 'Color4B(const Color4F &color4F);' and 'explicit Color4F(const Color3B &color3B)'.
2013-07-08 15:16:22 +08:00
James Chen
e28cf8d258
issue #2129 : Windows doesn't support 'initializer list', using constructor instead.
2013-07-07 21:08:14 +08:00
minggo
04465622b7
issue #2129:remove prefix of types in ccTypes.h
2013-07-05 16:49:22 +08:00
Ricardo Quesada
adaa72fbb4
Adds const to getters
...
Many getters in cocos2d are not declared as const.
This patch adds const to many cocos2d properties, specially in CCNode and
subclasses
2013-07-03 17:22:15 -07:00
James Chen
93b6328303
issue #2129 : Removing CC prefix for cocos2dx module.
2013-06-20 14:13:12 +08:00
James Chen
c0d44cb2e4
fixed #2129 : Rename m_iVar to _var, remove CC prefixes.
2013-06-15 14:03:30 +08:00
minggo
cd5bcb87af
issue #2284 : merge master and fixed some conflicts
2013-06-13 17:54:05 +08:00
chengstory
cfb424a6c9
1. add Component struct.
2013-06-04 17:38:43 +08:00
Jaroslaw Lewandowski
3f7c506638
Ability to save/retrieve CCData into/from CCUserDefault
2013-05-29 01:06:41 +01:00
Lee, Jae-Hong
27428dc5f4
Adding defines and enums for Tizen.
2013-05-16 19:49:16 +09:00
carlo morgantini
c9e875869e
comment fixed
2013-05-15 16:37:08 -07:00
carlo morgantini
04c890522d
class renamed and moved to ccTypes.h
2013-05-15 16:35:25 -07:00
carlo morgantini
bc9a74218c
added a new utility for comparing 2 ccColor3b
2013-05-15 16:29:33 -07:00
James Chen
99664b5998
Merge pull request #2391 from sbc100/log_asserts
...
fixed #2152 : Logging assert messages to the console and renaming CCScriptSupport::executeAssert to CCScriptSupport::handleAssert.
2013-05-13 19:56:28 -07:00
James Gregory
4f56f93269
Add #defines for Emscripten platform
2013-05-06 20:58:43 -07:00
Sam Clegg
4f6de1bcad
Rename CCScriptSupport::executeAssert -> CCScriptSupport::handleAssert
...
Also remove the first "cond" argument, since it is always false.
2013-05-06 12:25:13 -07:00
Sam Clegg
e699919bc6
Log assert messages
...
Now, assert messages as visible in the trace output
as well as the line number of condition that failed.
2013-05-06 12:25:13 -07:00
James Chen
f7b2ca2125
Fixing compilation errors when enable CC_ENABLE_PROFILERS.
2013-03-25 11:47:27 +08:00
minggo
648e9a7bf1
issue #1529:use NSUserDefaults on iOS and SharedPreferences on Android to implement CCUserDefault
2013-03-06 16:36:44 +08:00
minggo
f37b1525b4
issue #1529:use NSUserDefault to implement CCUserDefault on iOS
2013-03-05 14:53:37 +08:00
Sam Clegg
33c422d1d5
Add new port: Native Client
2013-03-02 12:15:24 -08:00
James Chen
56340f9555
Merge branch 'iss1686-synchronize' of https://github.com/minggo/cocos2d-x into iss1686-synchronize
...
Conflicts:
cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj
2013-02-28 13:01:45 +08:00
minggo
cd4f18c48f
issue #1686:synchronize CCLayer.cpp
2013-02-27 18:21:35 +08:00
minggo
94076a5b9c
issue #1686:synchronize CCSprite.cpp
2013-02-27 15:30:49 +08:00
James Chen
473e8e6139
issue #1753 : Upgrading SpiderMonkey to Firefox19.0, iOS works ok.
2013-02-27 15:16:49 +08:00
James Chen
7dc64fc9a6
issue #1686 : sync to CCLayer
2013-02-27 09:38:30 +08:00
James Chen
ac17f67686
issue #1712 : Adding getting dpi support for iOS and Android.
2013-02-16 19:36:21 +08:00
minggo
7d02925d7e
issue #1703:include tinyxml2 files in android/iOS project
2013-02-06 11:15:54 +08:00
walzer
4ae43e5901
fix typos in doxygen of CCSprite and CCProtocol
2013-01-14 21:51:47 +08:00
walzer
c9c227873f
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2013-01-14 17:07:07 +08:00
walzer
1ab552b482
Add a sample doxygen sample in CCSprite.h and CCProtocol.h
2013-01-14 16:54:20 +08:00
James Chen
6565fa92cc
fixed #1649 : Changed return type to const reference for member variable access.
2013-01-14 15:51:53 +08:00
folecr
58874dc7a5
CCAssert uses CC_ASSERT directly
...
* ... after call to cc_assert_script_compatible()
* CCAssert will now report the correct line number
2013-01-10 12:26:12 -08:00
James Chen
9ef74bef80
fixed #1636 : Deleted CC_ENABLE_CHIPMUNK_INTEGRATION and CC_ENABLE_BOX2D_INTEGRATION in ccConfig.h since they are moved to extension, it doesn't depend on engine any more.
...
Added platform macro for CCEditBoxImpl* files.
2013-01-05 11:10:24 +08:00
minggo
539bb56256
Merge pull request #1799 from tks2shimizu/gles20
...
Added CCFloat, CCDouble and CCBool
2013-01-03 19:32:35 -08:00
James Chen
b120874a87
fix compilation errors.
2012-12-29 11:23:31 +08:00
Tomoaki Shimizu
87146d82e1
Added CCFloat, CCDouble and CCBool
2012-12-27 23:15:13 +09:00
James Chen
f159df2e13
Compilation warning fix for CCAssert macro.
2012-12-27 16:48:02 +08:00
minggo
0adc6abe30
Merge pull request #1776 from dualface/make_ccassert_compatible_lua
...
[luabinding] make CCAssert compatible Lua
2012-12-26 23:28:32 -08:00
James Chen
7d9f06b48c
fixed #1625 : Updated TestCpp. 'ccg' --> 'CCSizeMake' . And exchanged the parameter order for 3D action tests.
2012-12-27 10:55:25 +08:00
James Chen
bb486af6a7
Added stackable action support. Exchanged the order of action.
2012-12-26 18:59:31 +08:00