John Conklin II b3698388ea Merge pull request #14245 from huffman/feat/default-grabbable-setting ... Add a 'grabbable' option to the new-model dialog		2018-10-22 11:42:40 -07:00
..
+android	Show stats button only in debug mode. Add isDebugMode to Script public interface	2018-05-29 17:21:44 -03:00
developer	Merge pull request #13890 from sethalves/grab-properties-1	2018-10-17 13:29:20 -07:00
modules	Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged	2018-10-04 08:59:26 -07:00
system	Merge pull request #14245 from huffman/feat/default-grabbable-setting	2018-10-22 11:42:40 -07:00
tutorials	Move grab pseudo-properties (userData) into first-class EntityItemProperties.	2018-10-02 08:54:12 -07:00
defaultScripts.js	Merge branch 'interstitialMerged' of github.com:wayne-chen/hifi into interstitialMerged	2018-10-04 15:01:39 -07:00