21 Commits

Author	SHA1	Message	Date
andyque	c8165bb2d9	fix indent problems	2014-07-04 11:53:06 +08:00
andyque	a429182765	fix windows compile and running error	2014-07-04 11:22:36 +08:00
zhangcheng	d1db470cf2	Merge branch 'macLoader' into v3_OpBinaryParse	2014-07-02 16:11:02 +08:00
zhangcheng	9204ac28df	1. merge v3	2014-07-02 15:37:15 +08:00
andyque	fb3e499d9d	fix Text reader font name	2014-07-02 10:08:04 +08:00
zhangcheng	4b8f818a1d	1、Update binary parse lib.	2014-07-01 16:31:17 +08:00
andyque	b9a968680f	add default value to widgets reader	2014-07-01 10:57:12 +08:00
andyque	8a463e7964	remove Hungry style	2014-06-23 10:02:09 +08:00
andyque	4d64b166cc	refactor - replace magic string with const string	2014-06-19 17:04:14 +08:00
andyque	a26ef87783	cleanup reader code	2014-06-19 15:16:56 +08:00
andyque	aa5df68b96	Merge branch 'v3' into cleanupBinaryLoader ... Conflicts: cocos/3d/CCAnimationCurve.h cocos/3d/CCAnimationCurve.inl	2014-06-18 15:13:34 +08:00
andyque	63475a6f81	refactor Loader	2014-06-18 14:44:00 +08:00
kyokomi	b6ed783b0b	fix use raw char* to represent string.	2014-06-17 17:05:44 +09:00
kyokomi	d7199204bd	Fix bug for TextReader #setFontName.	2014-06-14 23:56:12 +09:00
andyque	5515c43bb2	improve lasers	2014-06-11 15:16:08 +08:00
andyque	b895018765	update parser	2014-06-11 09:35:24 +08:00
andyque	8690122c96	add version 300 parsing code in widget reader	2014-06-05 10:25:08 +08:00
andyque	e6889dca36	issue #5110, refactor UIText	2014-05-14 15:26:14 +08:00
andyque	cbcc1bbbcf	let ios project compile correct	2014-03-11 18:48:26 +08:00
CaiWenzhi	bd5c11b5ee	Modify mk file and solve warnings	2014-03-06 16:15:03 +08:00
CaiWenzhi	4a2dc4a607	Add custom widget and reader	2014-03-04 16:51:35 +08:00