13 Commits

Author	SHA1	Message	Date
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
James Chen	3ffad35f0e	Merge pull request #3741 from signmotion/develop ... Fixed some compiling-warnings (MSVC2012).[ci skip]	2013-09-24 02:27:14 -07:00
CaiWenzhi	fa892c2158	Remove layoutexecutant class	2013-09-23 19:16:20 +08:00
signmotion	7d139a3bc3	Fixed compiling-warnings (MSVC2012): C4996(* was declared deprecated), C4305 (* truncation from 'double' to 'float'), C4018 (* signed/unsigned mismatch), C4800(* forcing value to bool 'true' or 'false').	2013-09-22 23:50:54 +03: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	c065dd2920	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into #4684	2013-09-17 22:41:42 +08:00
CaiWenzhi	1f45bad5e7	Modify guy example	2013-09-17 21:19:04 +08:00
zhangcheng	b86a8271d9	1. Upload Cocostudio Action.	2013-09-17 21:14:45 +08:00
CaiWenzhi	9d07b2c1d2	Temp commit	2013-09-17 20:13:23 +08:00
James Chen	fe1b11a814	Fixing wrong include.	2013-09-17 11:28:33 +08:00
CaiWenzhi	ca599b4852	Merge guy to 3.0 branch	2013-09-16 20:54:13 +08:00