14 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	e28cf8d258	issue #2129: Windows doesn't support 'initializer list', using constructor instead.	2013-07-07 21:08:14 +08:00
minggo	04465622b7	issue #2129:remove prefix of types in ccTypes.h	2013-07-05 16:49:22 +08:00
Sam Clegg	3686e8245f	[NaCl] Fix sigslot.h compilation on NaCl ARM	2013-06-20 10:54:11 -07: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
James Chen	cbcc2022cf	[Extension] RENDER_H --> CC_ARMATURE_GLES_RENDER_H	2013-06-10 14:17:16 +08:00
James Chen	6dcaca78d0	[jsoncpp] Value::null -> Value::jsonNull to avoid conflict when compiling with clang++ or high version of gcc since null is defined as a key word.	2013-06-09 18:56:22 +08:00
James Chen	13dd26c85b	[BB] Fixing compilation errors for CocoStudio runtime.	2013-06-09 15:29:51 +08:00
James Chen	56f5e9ca32	Changing namespace Json to CSJson to avoid conflicts.	2013-06-09 10:50:03 +08:00
yinkaile	245b0395b1	1.upload CCArmature	2013-06-06 12:02:54 +08:00