samcake 5d4b55eeea Merge branch 'master' of https://github.com/highfidelity/hifi into skin		2016-07-12 09:19:28 -07:00
..
developer	Cleaning up the lighting with the simpler approach where emissive and lightmap is displayed on forward	2016-07-08 18:14:05 -07:00
system	reduced radius of grab sphere	2016-07-08 18:23:33 -07:00
tutorials	conform to coding braces standard	2016-06-21 13:28:15 -07:00
defaultScripts.js	Merge pull request #8123 from AlexanderOtavka/first-person-hmd	2016-06-24 15:58:38 -07:00