10 Commits

Author	SHA1	Message	Date
jianglong0156	85c40b6580	Merge pull request #8 from pandamicro/physics3d ... Physics3d	2015-06-18 14:54:32 +08:00
pandamicro	3ffc0e6be6	Merge branch 'v3_navigation' of https://github.com/samuele3hu/cocos2d-x into physics3d	2015-06-18 09:20:37 +08:00
pandamicro	85e8a407b1	Merge branch 'navmesh' of https://github.com/jianglong0156/cocos2d-x into v3 ... # Conflicts: # tests/js-tests/project/Classes/AppDelegate.cpp # tools/tojs/genbindings.py	2015-06-17 19:58:24 +08:00
samuele3hu	683812d817	Update Physics3D test for js.	2015-06-17 18:50:55 +08:00
pandamicro	df1219c92d	Update manual conversion for sprite polygon	2015-06-12 12:56:37 +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	3523173594	removed CC_PLATFORM_WP8	2015-05-20 07:58:39 -07: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