7 Commits

Author	SHA1	Message	Date
Ricardo Quesada	a3eb0a058e	Merge branch 'develop' into dictionary_array_fixes ... Conflicts: cocos2dx/platform/mac/CCFileUtilsMac.mm extensions/CCBReader/CCBAnimationManager.cpp extensions/CCBReader/CCBReader.cpp extensions/CCBReader/CCBSequenceProperty.cpp extensions/GUI/CCScrollView/CCScrollView.cpp	2013-08-21 20:27:19 -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
James Chen	1ee7790f0e	Initializing Array after it was constructed.	2013-08-22 10:15:47 +08:00
James Chen	fa5c26c5e2	member variables renaming according cocos2d-x style.	2013-07-27 22:31:57 +08:00
James Chen	e66e429bb2	issue #2430: Moving enum type to class for CCBReader.	2013-07-27 21:44:49 +08:00
James Chen	cb67ed0227	issue #2129: Removing CC prefix for extension module.	2013-06-20 14:15:53 +08:00
minggo	0845e08fd3	issue #1470:update CCBReader to support Cocosbuilder v2.1 beta0	2012-09-17 14:27:17 +08:00