14 Commits

Author	SHA1	Message	Date
Liam	c7932b6181	fixed ui anmation crash when stop animation	2013-11-19 00:57:22 +08:00
chengstory	41975ba445	fixed #3185 ComponentTest and SceneTest NULL to nullptr.	2013-11-14 14:16:14 +08:00
CaiWenzhi	e0aa82da13	Merge master branch to develop branch	2013-11-06 16:04:06 +08:00
minggo	8f7a489a4d	issue #2905:make cocostudio and gui flat	2013-10-16 16:48:39 +08:00
James Chen	7dc8aeb156	issue #2905: Updating include path for 'cocostudio' module, adding 'cocostudio' prefix.	2013-10-16 11:19:01 +08:00
minggo	6fc2be62f5	issue #2905: testcpp bild ok on Android	2013-10-15 18:00:03 +08:00
minggo	bcb171e3c9	fix line end in windows	2013-09-20 22:23:13 +08:00
Ricardo Quesada	0674948325	Small fixes to comply with C++ best practices ... Small fixes to comply with C++ best practices	2013-09-18 19:38:21 -07:00
zhangcheng	820b8630dc	1. fixes failed to build linux.	2013-09-18 11:51:14 +08:00
zhangcheng	b86a8271d9	1. Upload Cocostudio Action.	2013-09-17 21:14:45 +08:00
CaiWenzhi	f983155d7c	Modify scene sample	2013-09-16 22:29:53 +08:00
zhangcheng	0121943c11	1. Adds SceneEditorTest hd version	2013-09-14 16:34:26 +08:00
chengstory	669de88e73	1. remove any unused functions.	2013-09-10 11:02:50 +08:00
zhangcheng	98fce2fa84	1. update Samples on develop branch.	2013-09-10 09:53:15 +08:00