9 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	342734e3b5	Merge remote-tracking branch 'upstream/v3' into physics	2015-05-21 21:15:42 +08:00
joshuastray	83237b8dbd	add physics3d js manual binding and tests	2015-05-21 18:05:49 +08:00
Dale Stammen	d68f2c1c3d	removed CC_PLATFORM_WP8	2015-05-20 07:56:14 -07:00
joshuastray	712ba4f64c	add physics3d auto binding	2015-05-20 10:36:26 +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
Wenhai Lin	7860f57ef0	Fixed compile errors	2015-04-17 14:00:53 +08:00
WenhaiLin	e50b14b7fb	Add js-tests	2015-04-16 18:07:35 +08:00