12 Commits

Author	SHA1	Message	Date
boyu0	1f72fafd08	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug2050_tilemap_firstgid_bug ... Conflicts: cocos/2d/CCTMXXMLParser.cpp cocos/2d/CCTMXXMLParser.h	2013-12-30 12:30:59 +08:00
boyu0	6e6ccbd5f9	change some const char* to const std::string&	2013-12-24 15:49:58 +08:00
James Chen	5f17984826	Don’t hide parent’s addChild method in TMXLayer class.	2013-12-23 21:53:23 +08:00
boyu0	baf8cb06c5	issue #2050: delete max/minGID, fix firstGID bug	2013-12-23 10:37:46 +08:00
boyu0	19e1609c27	issue #2050: unsigned int to int	2013-12-20 09:50:53 +08:00
James Chen	bb5ef615dd	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into pr4479 ... Conflicts: cocos/2d/CCSpriteBatchNode.h	2013-12-13 16:44:22 +08:00
Ricardo Quesada	a8c317bd83	getDescription() works as expected ... renames `description` to `getDescription`. Adds `virtual` to it. Adds `getDescription` to missing nodes.	2013-12-12 14:30:22 -08:00
minggo	1e9c763b40	use ssize_t for index and capacity	2013-12-12 14:48:26 +08:00
James Chen	54289276de	issue #2790: ValueArray —> ValueVector, ValueDict —> ValueMap, IntValueDict —> IntValueMap.	2013-12-04 17:46:57 +08:00
James Chen	4ec6e50cc4	issue #2790: Pure base data from Dictionary* to ValueDict, Array* to ValueArray.	2013-12-04 16:02:52 +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