22 Commits

Author	SHA1	Message	Date
pipu	752eb839c7	Add protocolbuf.a	2014-10-09 18:28:09 +08:00
Frank.Xu	1c1d917620	Fix pull request #6894 merge conflicts	2014-09-29 16:22:55 +08:00
Ricardo Quesada	3dda35b4ef	Adds `std::nothrow` to `new` ... Since cocos2d-x doesn't support exceptions, it is important to add `std::nothrow` to all the `new` statements	2014-08-27 16:31:57 -07:00
Dhilan007	6cff8cb564	fixed warn and replace NULL with nullptr.	2014-07-10 00:45:27 +08:00
zhangcheng	d1db470cf2	Merge branch 'macLoader' into v3_OpBinaryParse	2014-07-02 16:11:02 +08:00
zhangcheng	02c7c93e43	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into OpBinaryParse	2014-07-01 16:36:37 +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	199ad9c623	issue #5161, replace deprecated methods	2014-06-24 10:18:01 +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	63475a6f81	refactor Loader	2014-06-18 14:44:00 +08:00
andyque	1d01fe8bbc	refactor	2014-06-15 16:12:24 +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	6a7277c38f	issue #5057, refactor TextureResType to strong typed enum	2014-05-09 14:56:05 +08:00
andyque	3482815e69	issue #4636. refactor ImageViewReader	2014-04-04 17:18:24 +08:00
andyque	77aee27f05	issue #4636. refactor ButtonReader	2014-04-04 16:51:07 +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