12 Commits

Author	SHA1	Message	Date
boyu0	afde1e57b2	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 and fix the per premultipied tag	2013-07-30 11:10:05 +08:00
James Chen	a76f556fb2	[emscripten] Fixing compilation errors.	2013-07-29 16:33:34 +08:00
boyu0	cecfc13bc4	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345	2013-07-27 22:06:30 +08:00
boyu0	02bdfbf169	Combine CCTextureETC to CCImage and CCTexture2D.	2013-07-26 17:34:44 +08:00
boyu0	948acd6e29	Refactor CCTexture2D and CCImage	2013-07-19 15:37:54 +08:00
James Chen	93b6328303	issue #2129: Removing CC prefix for cocos2dx module.	2013-06-20 14:13:12 +08:00
James Chen	c0d44cb2e4	fixed #2129: Rename m_iVar to _var, remove CC prefixes.	2013-06-15 14:03:30 +08:00
James Gregory	8b4f5b5853	Fix calculation of offsets in font rendering so that we don't scribble all over memory!	2013-05-29 21:25:32 -07:00
James Gregory	7cca63130c	Pre-multiply text when rendered by Emscripten's SDL implementation (since HTML5 canvas is non-pre-multiplied).	2013-05-17 17:10:51 -07:00
James Gregory	bdbab7f5cf	TTF rendering via SDL now seems to basically work. Not perfect yet, but seems to be about 3X faster on Chrome.	2013-05-15 20:21:30 -07:00
James Gregory	ab2d94c040	First pass at using SDL to render fonts instead of FreeType.	2013-05-14 21:38:56 -07:00
James Gregory	edcd0f12e4	Add platform files for Emscripten.	2013-05-06 20:58:46 -07:00