7 Commits

Author	SHA1	Message	Date
James Chen	0af0ce9032	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss4058-ref-step1 ... Conflicts: cocos/scripting/auto-generated	2014-02-20 15:13:40 +08:00
James Chen	5e6130c92c	issue #4058: Get rid of Object ,rename it to Ref.	2014-02-20 10:53:49 +08:00
Dhilan007	ddd02b463c	optimize label: ... 1.remove unnecessary API 2.reduces object-creation and function calls.	2014-02-19 20:26:14 +08:00
Dhilan007	2ad81b0edb	closed #4060:fixed Label wasn't implemented correctly when Label::_fontAtlas contains multiple texture.	2014-02-18 14:30:51 +08:00
Dhilan007	e12c1f57ac	Label::reduce unnecessary calculation amount.	2014-02-10 11:21:54 +08:00
Pisces000221	49163bb774	Add LabelTTFCJKWrappingTest	2014-02-08 17:15:57 +08:00
Ricardo Quesada	e77d22a58f	samples -> tests	2014-01-31 14:09:28 -08:00