14 Commits

Author	SHA1	Message	Date
James Chen	1eadcd8b38	fixed #2301: Merge branch 'emscriptenate' of https://github.com/j4m3z0r/cocos2d-x into j4m3z0r-emscriptenate ... Conflicts: cocos2dx/proj.emscripten/cocos2dx.mk	2013-06-19 13:03:51 +08:00
James Gregory	ad90fe88a8	Merge remote-tracking branch 'origin/master' into emscriptenate	2013-06-17 20:30:36 -07:00
minggo	cd5bcb87af	issue #2284: merge master and fixed some conflicts	2013-06-13 17:54:05 +08:00
James Gregory	872be8e964	Initial commit of browser accelerated async image-loading code for Emscripten.	2013-06-12 14:46:32 -07:00
chengstory	cfb424a6c9	1. add Component struct.	2013-06-04 17:38:43 +08:00
Jaroslaw Lewandowski	3f7c506638	Ability to save/retrieve CCData into/from CCUserDefault	2013-05-29 01:06:41 +01:00
minggo	6f624351b3	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ETC1-support	2013-05-28 11:36:05 +08:00
minggo	b038741d78	issue #2161: make linux,marmalade,native client,mac and emscripten project to include CCTextureETC.cpp	2013-05-27 15:06:43 +08:00
James Chen	8448280ed3	issue 2217: Updating Make file and project configuration to add ccFPSImage.c.	2013-05-23 16:50:48 +08:00
James Chen	42427634f2	fixed #2142: Adding datavisitor support for other platforms except win32.	2013-05-10 15:37:40 +08:00
James Gregory	d529287cfa	Remove LOG prefixes from emscripten makefiles	2013-05-06 21:00:38 -07:00
James Gregory	5bac7b52ac	Move GL server-side buffer code into a separate class and use multiple inheritance to deploy only to classes that need it.	2013-05-06 20:59:48 -07:00
James Gregory	87daf9d3eb	Add missing Makefile reference to file utils for Emscripten.	2013-05-06 20:59:47 -07:00
James Gregory	c45e5797cf	Add Makefiles for Emscripten + Emscripten external	2013-05-06 20:58:02 -07:00