Jeff Clinton 49bf01294a Merge pull request #14320 from huffman/fix/default-collision-values ... Update the default edit.js collidesWith to include myAvatar		2018-11-08 09:17:40 -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 #14320 from huffman/fix/default-collision-values	2018-11-08 09:17:40 -08:00
tutorials	Move grab pseudo-properties (userData) into first-class EntityItemProperties.	2018-10-02 08:54:12 -07:00
defaultScripts.js	Merge pull request #13904 from alexiamandeville/menu-updates	2018-10-24 19:41:22 -07:00