18 Commits

Author	SHA1	Message	Date
Dhilan007	9dfa099bef	Label:Refactoring related functions of color.	2014-03-20 20:56:10 +08:00
andyque	8c1bf48357	fixed label font size: from int to float	2014-03-20 15:03:48 +08:00
andyque	8a409db1b6	change setFontSize from int to float	2014-03-20 14:14:02 +08:00
andyque	7ae77c9335	fix cocos2dx engine internal warnings	2014-03-20 10:58:04 +08:00
Dhilan007	bc7e39283f	issue #3821:LabelTTF re-implemented as a wrapper of Label.	2014-03-12 10:19:33 +08:00
walzer	64af0de648	update copyrights for 2014, in cocos/2d/ folder	2014-01-07 11:25:07 +08:00
boyu0	e07c4ffec1	Change NULL to nullptr, edit hungarian notation.	2013-12-18 17:47:20 +08:00
Ricardo Quesada	61cc365d9e	Merge branch 'develop' into newRenderer ... Conflicts: cocos/2d/CCGLProgram.h cocos/2d/CCLabelTTF.h	2013-12-12 14:41:42 -08:00
Ricardo Quesada	a8c317bd83	getDescription() works as expected ... renames `description` to `getDescription`. Adds `virtual` to it. Adds `getDescription` to missing nodes.	2013-12-12 14:30:22 -08:00
Ricardo Quesada	29a15c885a	Merge branch 'develop' into newRenderer	2013-12-12 11:44:09 -08:00
James Chen	976bef8b68	issue #2790: StringUtils::toStringWithFormat —> StringUtils::format.	2013-12-12 09:37:56 +08:00
James Chen	be9bb6998b	issue #2790: Deprecates Dictionary, Array, String, Integer, Bool, Float, Double classes. ... Also renames Map::remove to Map::erase.	2013-12-11 18:08:06 +08:00
Ricardo Quesada	81b06f06a9	Merge branch 'develop' into newRenderer ... Conflicts: cocos/2d/CCAtlasNode.h	2013-12-05 22:24:41 -08:00
Ricardo Quesada	ffd4342548	Adds more strings ... and more `override` and fixes some indetentation issues	2013-11-07 12:42:16 -08:00
Ricardo Quesada	ddb0111392	continue replacing `const char*` with `const std::string&` ... This patch includes: * Continue replacing `const char*` with `const std::string&` where it makes sense. * It also removes some Hungarian notation from the code. * It fixes some indentation issues in part of the code * It replaces `int` or `unsigned int` with `long` where it makes sense.	2013-11-06 17:05:13 -08:00
Ricardo Quesada	555f3609c8	Uses `const std::string&` ... ... instead of const char* * Because it is more robust * and it is faster... yes faster. It is faster because internally some of our classes use std::string (like FileUtils and Dictionary) so converting back-and-forth from const char * to std::string is very expensive. It is faster to have everthing in std::string as soon as possible to prevent further conversions. There are still some parts of the code that require conversion, but most of the code was converted.	2013-11-05 19:02:03 -08:00
minggo	95acb1b9e3	issue #2905: helloworld build ok on android	2013-10-14 14:01:00 +08:00
minggo	49d7bbd600	issue #2905: remove sub folders except platform	2013-10-12 15:41:45 +08:00