12 Commits

Author	SHA1	Message	Date
chuanweizhang2013	b80d825421	commit	2014-06-26 04:41:54 -07:00
chuanweizhang2013	7f75b58acf	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime ... Conflicts: templates/lua-template-runtime/cocos-project-template.json	2014-06-23 17:30:33 +08:00
gin0606	2c837b0960	add new line at the end of a file to *.mk	2014-06-19 20:43:27 +09:00
chuanweizhang2013	e1d7871089	add mac android support	2014-06-19 11:27:31 +08:00
cw	3807c7cffc	resource to binary	2014-05-30 13:53:49 +08:00
chuanweizhang2013	4b812f8b80	modify runtime folder	2014-05-30 11:00:26 +08:00
chuanweizhang2013	ee4b6ba2bc	add visibleRect	2014-05-08 13:57:34 +08:00
cw	c9a7c44537	rename mac simulator app's file simulatorconfig class	2014-05-07 11:10:46 +08:00
chuanweizhang2013	eb6ef4d067	tab to 4 space	2014-04-10 15:51:25 +08:00
cw	d34fddb06e	rename lua folder	2014-04-09 17:03:38 +08:00
chuanweizhang2013	0dc85e42a7	modify module_path	2014-03-13 09:51:43 +08:00
cw	133a68f614	add runtime template	2014-03-11 16:52:06 +08:00