12 Commits

Author	SHA1	Message	Date
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	f4471ae93c	Modify layout enum	2013-09-23 21:26:44 +08: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
minggo	bcb171e3c9	fix line end in windows	2013-09-20 22:23:13 +08:00
CaiWenzhi	841408d1bc	Modify events methods	2013-09-17 20:34:26 +08:00
CaiWenzhi	9d07b2c1d2	Temp commit	2013-09-17 20:13:23 +08:00
CaiWenzhi	9d6d9dcd19	Add getDescription method	2013-09-17 17:59:20 +08:00
CaiWenzhi	ca599b4852	Merge guy to 3.0 branch	2013-09-16 20:54:13 +08:00
James Chen	5ee8ad8c4f	Fix compilation errors for CocoGUI.	2013-09-16 17:12:15 +08:00
CaiWenzhi	210af21615	Modify member names	2013-09-16 17:12:15 +08:00
CaiWenzhi	4843046d17	Merge GUI to develop step 1;	2013-09-16 17:12:15 +08:00