14 Commits

Author	SHA1	Message	Date
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
James Chen	7a8f2ae235	size_t —> ssize_t in CCTMXLayer.cpp	2013-12-13 16:41:03 +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
minggo	fa7c97171b	fix some warnings	2013-12-06 16:32:06 +08:00
James Chen	499a0404d4	issue #2790: Renames some functions in Vector<T>. Makes it more like stl vector.	2013-12-05 10:35:10 +08:00
James Chen	76896d70d0	issue #2790: Android build was ok, fixes some warnings.	2013-12-04 16:02:54 +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
James Chen	1d5984b29a	issue #2790: Vector::makeObjectsPerformCallback —> Vector::forEach	2013-12-04 16:01:02 +08:00
James Chen	90062b656d	issue #2790: Node::_children is Vector<Node*> now.	2013-12-04 16:00:17 +08:00
Ricardo Quesada	d590986e73	Constructors are protected	2013-11-13 15:55:36 -08:00
Huabing.Xu	99bcca0532	issue #3025: replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in cocos folder	2013-11-07 19:11:09 +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