11 Commits

Author	SHA1	Message	Date
minggo	cd5bcb87af	issue #2284: merge master and fixed some conflicts	2013-06-13 17:54:05 +08:00
James Chen	6f01085a01	[emscripten] Updating extension makefile.	2013-06-10 20:53:33 +08:00
yinkaile	f2021982f4	Change CCAnimation to CCArmatureAnimation	2013-06-08 11:16:17 +08:00
yinkaile	65974f2243	standardize code	2013-06-07 10:52:32 +08: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
samuele3hu	8b5450ef4a	issue #2103 modify some build script	2013-05-24 13:55:05 +08:00
samuele3hu	0a1c12a2d3	issue #2103 add some overlapping file and delete some comment line	2013-05-24 13:45:06 +08:00
samuele3hu	338c7c8d67	issue #2103 add more test lua	2013-05-24 11:42:27 +08:00
James Gregory	d529287cfa	Remove LOG prefixes from emscripten makefiles	2013-05-06 21:00:38 -07:00
James Gregory	c45e5797cf	Add Makefiles for Emscripten + Emscripten external	2013-05-06 20:58:02 -07:00