10 Commits

Author	SHA1	Message	Date
walzer	d4c1aa92d5	add copyrights for 2014, in folders other then 2d.	2014-01-07 11:47:11 +08:00
chengstory	faaf6d3f2b	fixed #3457 fixes some bug.	2013-12-27 17:21:13 +08:00
Liam	0cdf2d15fe	merge from develop branch	2013-12-27 10:50:50 +08:00
Liam	2a6c24f8bf	update coco action with correct coding rule	2013-12-27 10:43:49 +08:00
chengstory	774e3d8536	issue #3457 ... 1. replace UIAction NULL to nullptr. 2. modify class variable name.	2013-12-26 23:40:50 +08:00
Liam	bc54707893	modify coco action with new coding rule	2013-12-26 16:29:59 +08:00
yinkaile	5eb961b165	fixed warning	2013-12-25 19:46:09 +08:00
zhangcheng	2c6f95ecea	issue #3456 replace jsoncpp to rapidjson.	2013-12-24 20:33:55 +08:00
Liam	c7932b6181	fixed ui anmation crash when stop animation	2013-11-19 00:57:22 +08:00
minggo	8f7a489a4d	issue #2905:make cocostudio and gui flat	2013-10-16 16:48:39 +08:00