11 Commits

Author	SHA1	Message	Date
Ricardo Quesada	d7590affda	Merge branch 'develop' into dictionary_array_fixes ... Conflicts: cocos2dx/cocoa/CCArray.cpp cocos2dx/cocoa/CCArray.h cocos2dx/label_nodes/CCLabel.cpp extensions/CCArmature/datas/CCDatas.cpp extensions/CCArmature/display/CCDisplayManager.cpp	2013-08-21 21:27:44 -07:00
Ricardo Quesada	2e221ee6cc	Array & Dictionary fixes ... In many places `Dictionary` and `Array` are not being initialized. In fact `Dictionary` doesn't have the `init()` method creating potential leaks. Also in objects like `Armature` and the new `LabelTTF`, the `Array` object is not being used a pointer. So it doesn't use the 2 phase initialization, creating potential leaks. This patch fixes all those issues. Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>	2013-08-21 20:12:09 -07:00
minggo	2de8963a0a	fix warnings caused by deprecating some functions of Array	2013-08-22 10:45:47 +08:00
James Chen	cb67ed0227	issue #2129: Removing CC prefix for extension module.	2013-06-20 14:15:53 +08:00
James Chen	78a5dff06d	issue #2129: Resetting the namespace of armature to 'cocos2d::extension::armature'.	2013-06-20 12:59:32 +08:00
James Chen	c0d44cb2e4	fixed #2129: Rename m_iVar to _var, remove CC prefixes.	2013-06-15 14:03:30 +08:00
yinkaile	a10d0734f2	Standardize code	2013-06-07 19:48:31 +08:00
yinkaile	d4116f8478	1.remove #pragma endregion ... 2.change str.compare("")==0 to str.length()==0	2013-06-07 14:01:03 +08:00
yinkaile	65974f2243	standardize code	2013-06-07 10:52:32 +08:00
yinkaile	10ed7ebdf4	merge newest version	2013-06-06 16:22:58 +08:00
yinkaile	245b0395b1	1.upload CCArmature	2013-06-06 12:02:54 +08:00