6 Commits

Author	SHA1	Message	Date
andyque	c5a505ec4c	issue #5057, Merge branch 'v3' into refactor5057 ... Conflicts: cocos/ui/CocosGUI.h	2014-05-09 15:39:02 +08:00
Dhilan007	06f264e87d	rename VideoWidget to VideoPlayer.	2014-05-09 11:30:07 +08:00
Dhilan007	af26fb9b07	issue #4870:Add a ui widget of playing video	2014-05-08 18:13:50 +08:00
andyque	0c2fd977ea	issue #5057. add UIDeprecated.h and refactor FocusDirection to inner class of ... Widget and also simplify the enum value	2014-05-08 18:10:21 +08:00
CaiWenzhi	243b7e5822	Modify layout and add Boxes	2014-03-25 17:15:54 +08:00
andyque	cbcc1bbbcf	let ios project compile correct	2014-03-11 18:48:26 +08:00