10 Commits

Author	SHA1	Message	Date
minggo	221be759c6	issue #1324: merge James Chen's codes	2012-06-14 18:54:05 +08:00
minggo	94235d3602	issue #1310: make tests and HelloWorld work ok	2012-06-11 10:41:52 +08:00
minggo	dfa1216ba9	add CCBReader into project	2012-06-01 11:01:09 +08:00
James Chen	1ddb5d51b5	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20	2012-05-29 17:13:21 +08:00
minggo	a09bbbd0ba	fixed #1177: modify project setting, because CCStd.h is moved into platform/ios	2012-05-29 16:23:57 +08:00
James Chen	19c96632b5	fixed #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces.	2012-05-29 16:21:23 +08:00
minggo	0fdd9f3fd7	move js files into Resources	2012-05-28 17:21:42 +08:00
minggo	71e333f312	fixed #1258: add fps png/fnt	2012-05-25 11:00:59 +08:00
Walzer	fecab7f3b1	fixed #1258, all js test cases passed.	2012-05-24 18:34:00 +08:00
Walzer	1e732930b7	fixed #1258, testjs and spidermonkey-ios is merged. But only test_actions.js works.	2012-05-24 17:48:05 +08:00