8 Commits

Author	SHA1	Message	Date
Dhilan007	65c2e03721	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into new_label	2014-01-22 15:08:05 +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
James Chen	3aac0b32a2	Merge pull request #5142 from Dhilan007/develop_label ... close #3805:fix wrap error and alignment error.	2014-01-21 19:35:45 -08:00
Dhilan007	697b0289c7	close #3805:fix wrap error and alignment error.	2014-01-21 17:55:49 +08:00
James Chen	432534d857	#include “cocos2d.h” was FORBIDDEN in cocos modules. Reduces the dependence when header file changes.	2014-01-20 17:31:12 +08:00
Ricardo Quesada	feec6a1e8a	Adds some Asserts in the renderer ... Linux still has a bug, but I can't reproduce it all the time. Hoping that these asserts will help me find it	2014-01-16 22:29:25 -08:00
Dhilan007	f5afa09de1	remove unneeded empty line.	2014-01-17 09:46:59 +08:00
Dhilan007	a765e5e7e1	closed #3628:Integrate LabelAtlas with new Label	2014-01-16 16:37:29 +08:00