13 Commits

Author	SHA1	Message	Date
James Chen	5e6130c92c	issue #4058: Get rid of Object ,rename it to Ref.	2014-02-20 10:53:49 +08:00
James Chen	75dddf390b	unsigned short int * -> unsigned short* , remove unneeded `int`.	2014-01-26 21:33:22 +08:00
Dhilan007	df21bbf7df	1.remove unused code ... 2.reduce calculation amount. 3.reduces expenses of function calls	2014-01-22 14:57:11 +08:00
Dhilan007	697b0289c7	close #3805:fix wrap error and alignment error.	2014-01-21 17:55:49 +08:00
Dhilan007	f22e4d474f	move some method to FontFreeType that only relating to FontFreeType from Font.	2014-01-21 10:36:32 +08:00
Dhilan007	a0b86abcf4	close #3765:Simplify label.Remove FontAtlasFactory,FontDefinition and TextImage.	2014-01-20 10:32:12 +08:00
Ricardo Quesada	a74a524eaa	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into header_dependency_fixes	2014-01-16 21:36:22 -08:00
Ricardo Quesada	d0dbf34319	removes "include "cocos2d.h" from cocos2d files	2014-01-16 21:35:58 -08:00
Dhilan007	a765e5e7e1	closed #3628:Integrate LabelAtlas with new Label	2014-01-16 16:37:29 +08:00
walzer	64af0de648	update copyrights for 2014, in cocos/2d/ folder	2014-01-07 11:25:07 +08:00
Dhilan007	39280d55f3	new label:add support for distanceField ... PerformanceTest:add performance test for label.	2013-12-13 12:42:15 +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
minggo	49d7bbd600	issue #2905: remove sub folders except platform	2013-10-12 15:41:45 +08:00