15 Commits

Author	SHA1	Message	Date
Ricardo Quesada	75b9913c92	LabelTTF vertical alignment fixed on OS X ... vertical alignment was broken on OS X. top and bottom were switched.	2013-06-11 14:59:40 -07:00
Ben Ward	0f8fa2e5a4	Fixed tabbing.	2013-06-04 10:45:20 +08:00
Ben Ward	73b8050fa1	Fixed linebreaks on Mac OSX	2013-06-04 10:45:07 +08:00
minggo	81b349d9ce	fixed #1637:fix mac retina display and labelttf	2013-02-27 11:10:42 +08:00
James Chen	da91e97e17	Merge branch 'add_webp_support' of https://github.com/dualface/cocos2d-x into iss1770-webp ... Conflicts: scripting/javascript/bindings/generated	2013-02-05 11:22:53 +08:00
dualface	d6686fe57c	Merge branch 'upstream_master' into add_webp_support	2013-02-02 12:24:05 +08:00
minggo	249b935be8	fix some warnins	2013-01-28 20:34:52 +08:00
dualface	0b25220f22	update libwebp to 2.1 ... add support RGB888, RGB565,RGBA4444	2012-12-30 02:12:02 +08:00
dualface	39c4765423	fix for mac	2012-12-29 14:17:52 +08:00
YuLei	a5e34ee754	[Mac] add CCApplication:setResourceRootPath(), CCApplication:setStartupScriptFilename()	2012-09-05 16:15:09 +08:00
YuLei	39b019b2cb	[Mac] fix CC_ASSERT error ... [Mac] add CC_DISABLE_ASSERT check [cocos2d-x] CCSprite::createWithSpriteFrame() check pSpriteFrame	2012-09-04 11:16:59 +08:00
Donald Alan Morrison	857608495c	Plugged CoreFoundation memory leaks identified by Static Analyzer.	2012-08-24 23:34:20 -07:00
Donald Alan Morrison	9f1899978e	Fixed potential memory leak identified by Static Analyzer.	2012-08-24 21:39:41 -07:00
minggo	c31415b7bd	issue #1405:resolution supports on mac	2012-08-09 14:34:20 +08:00
Nat Weiss	d4b6d1262b	Adding Mac support!	2012-07-20 21:23:40 -07:00