112 Commits

Author	SHA1	Message	Date
Dhilan007	0646e59bf3	resolve conflict	2013-11-20 10:26:00 +08:00
Ricardo Quesada	582afe3b61	Fixes warnings in CCLabel ... These warnings were introduced yesterday. Since we are paying attention to the warnings, new code MUST NOT generate new warnings.	2013-11-19 13:51:40 -08:00
Dhilan007	1a65af9d1a	fix warn	2013-11-19 15:54:54 +08:00
Dhilan007	f0ab3f9ca1	fix some error in layer controller code	2013-11-19 15:41:22 +08:00
Dhilan007	0586c4d275	recover controller on layer.	2013-11-19 13:56:30 +08:00
boyu0	e8d06496d0	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical	2013-10-30 17:27:09 +08:00
boyu0	66d1bbd89f	issue #2771: edit physics effect with all bodies and fix some bugs	2013-10-28 16:17:19 +08:00
James Chen	efa5afb1c3	[Dispatcher] Removing unused codes in Layer.	2013-10-25 15:19:25 +08:00
James Chen	9632cd7949	memoryleak fix.	2013-10-25 10:53:47 +08:00
James Chen	779e539658	Remove event controller codes from Layer class. HelloCpp works.	2013-10-25 10:53:45 +08:00
minggo	95acb1b9e3	issue #2905: helloworld build ok on android	2013-10-14 14:01:00 +08:00
minggo	49d7bbd600	issue #2905: remove sub folders except platform	2013-10-12 15:41:45 +08:00