7 Commits

Author	SHA1	Message	Date
Nicolas Gramlich	4378731418	Merge with gles20.	2012-06-11 10:43:07 -07:00
Nicolas Gramlich	2d86a4089c	CCLabelBMFont: Now using std::string to store internal data instead of just storing a 'foreign' const char *.	2012-06-05 17:11:50 -07:00
Nicolas Gramlich	8dbe897755	CCLabelBMFont: Made fntFile a property. (According to: ffbdb60a5908f5baef227bb0365a0b2653a3a59a)	2012-06-01 11:59:10 -07:00
Nicolas Gramlich	827ee160b5	Added support for initializing a CCLabelBMFont without a fntfile and a string. (See: ffbdb60a5908f5baef227bb0365a0b2653a3a59a, a6749b38f8085ba81921063328bc50cb7a989613, e6e3917c0c3f2e95e13c3be29584cb9e3781d3a7).	2012-05-30 15:31:08 -07:00
James Chen	1d94ba05a0	fixed #1189: updated linebreak and tab(4 space) for all source files.	2012-04-25 18:17:04 +08:00
James Chen	a5f0bc3cbc	fixed #1189: syn 1.0 branch: CCLabelBMFont updateLabel() optimizations and fixes	2012-04-25 18:08:23 +08:00
James Chen	0f36a89c7e	issue #1188: Refactor directory. Compile successfully on android and win32(vs2008 debug).	2012-04-25 16:18:04 +08:00