Jeff Clinton ee9154a801 Merge pull request #14341 from sethalves/fix-mouse-equip ... only equip an entity to a hand-controller joint if the hand-controllers are in use, else use avatar hand		2018-11-09 12:54:36 -08:00
..
+android
developer	Merge branch 'master' of github.com:highfidelity/hifi into black-bis	2018-11-07 12:07:15 -08:00
modules	Fix four bugs; truncate some logs	2018-11-01 10:29:38 -07:00
system	Merge pull request #14341 from sethalves/fix-mouse-equip	2018-11-09 12:54:36 -08:00
tutorials
defaultScripts.js	Merge pull request #13904 from alexiamandeville/menu-updates	2018-10-24 19:41:22 -07:00