15 Commits

Author	SHA1	Message	Date
XiaoFeng	20a6151f4c	Fix indent	2015-06-09 17:40:42 +08:00
XiaoFeng	f6083f3490	Fix issue 10258 & 10408	2015-06-09 14:38:48 +08:00
zhangcheng	8bf4c8b6c9	1. Fixes CCTimeLine warning. ... 2. Fixes CocoLoader warning. 3. Fixes TriggerTest Bug.	2014-07-15 18:07:33 +08:00
geron-cn	64408a5d8f	fix bug: crash in ui csbs	2014-07-11 19:02:14 +08:00
minggo	4895e6d54a	Merge pull request #7362 from geron-cn/chukongv3 ... Chukongv3	2014-07-10 21:17:19 +08:00
geron-cn	1c4cb78745	deal with null in string	2014-07-10 18:24:11 +08:00
Dhilan007	6cff8cb564	fixed warn and replace NULL with nullptr.	2014-07-10 00:45:27 +08:00
zhangcheng	af0613cf32	1、fixes warning.	2014-07-09 00:09:35 +08:00
andyque	32724e559d	fix container default color issue	2014-07-03 14:38:45 +08:00
zhangcheng	4b8f818a1d	1、Update binary parse lib.	2014-07-01 16:31:17 +08:00
andyque	8a463e7964	remove Hungry style	2014-06-23 10:02:09 +08:00
andyque	95f1bd7e72	update loader	2014-06-18 11:54:25 +08:00
andyque	b895018765	update parser	2014-06-11 09:35:24 +08:00
andyque	6bbf5a1459	tests	2014-06-06 10:12:23 +08:00
andyque	b570487bf3	add cocostudio binary file parser	2014-06-05 10:24:12 +08:00