9 Commits

Author	SHA1	Message	Date
minggo	6abe6fce78	closed #2393: fix conflicts	2013-07-12 18:04:32 +08:00
minggo	15096b0716	issue #2393:mark CCPointMake CCSizeMake CCRectMake as deprecated	2013-07-12 14:30:26 +08:00
Ricardo Quesada	cf262c28e2	getInstance() / destroyInstance() are used... ... ... instead of sharedXXX / purgeXXX. They are more C++ friendly, and also easier to remember. common files + Mac files + iOS files + tests/samples files were updated. The old methods are deprecated now.	2013-07-11 15:24:23 -07:00
James Chen	596c4c3cf2	issue #2387: Using static_cast instead of C style cast while iterating CCDictionary.	2013-07-09 14:40:43 +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	65974f2243	standardize code	2013-06-07 10:52:32 +08:00
yinkaile	245b0395b1	1.upload CCArmature	2013-06-06 12:02:54 +08:00