10 Commits

Author	SHA1	Message	Date
carlo morgantini	b2579987e5	Merge remote-tracking branch 'cocos2d/develop' into new_develop_merge ... Conflicts: cocos2d_libs.xcodeproj/project.pbxproj cocos2dx/include/ccTypes.h samples/samples.xcodeproj/project.pbxproj	2013-07-31 13:58:25 -07:00
James Chen	e66e429bb2	issue #2430: Moving enum type to class for CCBReader.	2013-07-27 21:44:49 +08:00
carlo morgantini	23575f0a68	New Label stuff merged and Label::Alignment replaced with TextVAlignment and TextHAlignment	2013-07-26 16:04:21 -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	2293630335	issue #2430:move enum in ccTypes.h class	2013-07-25 18:46:43 +08:00
minggo	04465622b7	issue #2129:remove prefix of types in ccTypes.h	2013-07-05 16:49:22 +08:00
James Chen	cb67ed0227	issue #2129: Removing CC prefix for extension module.	2013-06-20 14:15:53 +08:00
James Chen	e0948a4817	fixed #1576: Sync CCBReader to latest version, CCString* --> std::string, CocosBuilderTest crash fixes.	2012-11-26 21:51:05 +08:00
James Chen	e4cee68688	Added libExtensions.lib for TestJavascript vs2010 project. ... Removed some calling of 'USING_NS_CC;' in extensions.	2012-09-24 11:47:33 +08:00
minggo	f9c40f7372	issue #1399: work ok on iOS after adjusting directory structure	2012-07-19 17:22:36 +08:00