71 Commits

Author	SHA1	Message	Date
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	af819c6db5	Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x	2013-06-08 22:09:34 +08:00
yinkaile	d29931dc4f	1.add hd resource ... 2.remove zobie resource 3.support frame event	2013-06-08 22:08:22 +08:00
James Chen	ab15cd8c7b	[CCArmature] Updating CCDatas.h. Why to name it 'CCDatas.h" ?????	2013-06-08 16:45:25 +08:00
yinkaile	f2021982f4	Change CCAnimation to CCArmatureAnimation	2013-06-08 11:16:17 +08:00
yinkaile	a959c621f2	Standardize code	2013-06-07 21:00:45 +08:00
yinkaile	1be7827d03	Standardize code	2013-06-07 20:54:35 +08:00
yinkaile	d66a3870d4	Standardize code	2013-06-07 20:07:01 +08:00
yinkaile	718a8e763e	Standardize code	2013-06-07 19:57:15 +08:00
yinkaile	a10d0734f2	Standardize code	2013-06-07 19:48:31 +08:00
yinkaile	ba09c20434	Standardize code	2013-06-07 18:50:35 +08:00
yinkaile	6a6245eefd	Standardize code	2013-06-07 18:29:47 +08:00
yinkaile	850ea39107	Standardize code	2013-06-07 17:10:53 +08:00
yinkaile	2418afc96d	conform declare and initialize order	2013-06-07 16:13:08 +08:00
yinkaile	e1e41f7124	move const value to CCDataReaderHelper.cpp	2013-06-07 14:47:08 +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