7 Commits

Author	SHA1	Message	Date
Nicolas Gramlich	58b53be708	Merge with gles20.	2012-06-11 11:50:32 -07:00
minggo	b4899ae46d	issue #1310: synchronize CCLabelTTF	2012-06-11 14:36:25 +08:00
Nicolas Gramlich	c9db868d93	CCLabelTTF: Now internally using std::string instead of std::string *.	2012-06-05 17:12:41 -07:00
Nicolas Gramlich	eee8ba7586	CCLabelTTF: Added getters for fontName and fontSize.	2012-06-01 15:11:16 -07:00
Nicolas Gramlich	36e6d94d46	Added setter for dimensions of CCLabelTTF (According to: 302dd76b4f87ddb18cc571ebec3be0811ea534ca).	2012-05-30 16:49:51 -07:00
Nicolas Gramlich	9ca7fa468a	Added default init method for CCLabelTTF (See: 24125b93aad2d4fc7ebf1bc6e4ef6b8b83ff770d).	2012-05-30 15:34:50 -07:00
James Chen	0f36a89c7e	issue #1188: Refactor directory. Compile successfully on android and win32(vs2008 debug).	2012-04-25 16:18:04 +08:00