6 Commits

Author	SHA1	Message	Date
jianglong0156	7820610f13	Merge branch 'modifyTestResource' into jsWebviewTest ... Conflicts: cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj tests/js-tests/project.json tests/js-tests/src/GUITest/UIWebViewTest/UIWebViewTest.js tools/tojs/genbindings.py	2015-05-26 17:49:17 +08:00
joshuastray	1366f615dd	mac && ios works	2015-05-22 10:43:37 +08:00
joshuastray	ead74ac89e	add CC_ENABLE_BULLET_INTEGRATION=1 to js project	2015-05-17 23:11:17 +08:00
jianglong0156	80326aa40e	add webiew jsb code	2015-05-12 10:30:51 +08:00
joshuastray	234f4db8a0	add SpritePolygon binding && js tests	2015-05-11 17:04:23 +08:00
zhangbin	b4f2d94109	Update js bindings & js tests.	2015-05-05 10:50:19 +08:00