10 Commits

Author	SHA1	Message	Date
James Chen	8e290cad6e	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1454_javascript	2012-08-31 23:29:02 +08:00
James Chen	94a1aa6123	issue #1454: fixed bugs in test-particles.js.	2012-08-31 23:28:43 +08:00
minggo	dacf1704fc	issue #1454:use pvr instead of pvr.gz and fix a bug of build_native.sh	2012-08-31 23:16:36 +08:00
James Chen	9ba5a1bfef	issue #1454: Removed COCOS2D_JAVASCRIPT macro.	2012-08-31 21:23:23 +08:00
James Chen	dd8c993581	issue #1454: Removed some duplicated resources files.	2012-08-31 19:50:20 +08:00
folecr	e00240c8aa	Rename Resources/JS to Resources/oldjs to avoid conflict with js	2012-08-28 17:44:00 -07:00
Rohan Kuruvilla	8d7516a0ef	Test project for cocos2d-x js.	2012-08-27 10:07:31 -07:00
James Chen	5b6497b0e4	Updated test_actions.js. 'new cc.Sprite.create' --> 'cc.Sprite.create'.	2012-07-20 17:12:17 +08:00
James Chen	557f654cf3	Built successfully on android.	2012-07-20 17:06:00 +08:00
James Chen	77f1fba566	issue #1399: Adjust folder structure, made it built successfully on win32.	2012-07-20 14:05:52 +08:00