18 Commits

Author	SHA1	Message	Date
carlo morgantini	23575f0a68	New Label stuff merged and Label::Alignment replaced with TextVAlignment and TextHAlignment	2013-07-26 16:04:21 -07:00
minggo	0870581623	fix warnings	2013-07-26 15:22:45 +08:00
minggo	0b8de88ddc	issue 2430:use enum class	2013-07-26 12:08:18 +08: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	2293630335	issue #2430:move enum in ccTypes.h class	2013-07-25 18:46:43 +08:00
Ricardo Quesada	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
Ricardo Quesada	c158cd5be6	More best practices fixes ... - Removes Hungarian notation from the CPP test (there are still some Hungarian to remove) - Label and MotionStreak: Uses the CL() entry for the tests (lambda functions)	2013-07-22 17:25:44 -07:00
Ricardo Quesada	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
minggo	6abe6fce78	closed #2393: fix conflicts	2013-07-12 18:04:32 +08:00
minggo	5d9fea1416	issue #2393:mark PointZero RectZero and SizeZero as deprecated	2013-07-12 14:47:36 +08:00
minggo	15096b0716	issue #2393:mark CCPointMake CCSizeMake CCRectMake as deprecated	2013-07-12 14:30:26 +08:00
minggo	bb758df0d0	issue #2393:mark ccp as deprecated	2013-07-12 14:11:55 +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
James Chen	dcaa55e622	Warning fixes for TestCpp. Using lambda, CC_CALLBACK_1 and clone pattern.	2013-06-21 14:15:20 +08:00
James Chen	1fb9f44d15	issue #2129: Removing CC prefix for samples module.	2013-06-20 14:17:10 +08:00
James Chen	0ca86db0ff	fixed #1647: Renaming enumerations to Cocos2d-x style. ERROR and ERROR_TIMEOUT is defined as macros on Windows, fuck it.	2013-06-03 10:12:55 +08:00
James Chen	8e15cdf5fd	WS_ERROR -> ERROR, WS_STATE -> STATE.	2013-06-01 19:51:10 +08:00
James Chen	05a88c89dc	fixed #1647: Adding WebSocket support for Cpp and JSB.	2013-05-31 23:13:03 +08:00