David Back 9df8ea35bb Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor		2018-10-23 13:28:35 -07:00
..
avatar	remove tabs from avatar-animation.json	2018-09-10 10:49:43 -07:00
config
controllers	Add copy/paste functionality to edit.js	2018-10-22 13:56:07 -07:00
fonts	Merge pull request #13386 from ElderOrb/FB13949	2018-07-09 15:20:18 -07:00
html	Adding handshake control to image	2018-09-17 14:01:23 -07:00
icons	Small bugfixes and using original endpoints	2018-09-19 16:15:59 -07:00
images	Merge pull request #14122 from SamGondelman/skybox	2018-10-17 09:50:00 -07:00
mention-sounds
meshes	Merge pull request #13889 from alexiamandeville/controllerModelUpdates	2018-10-19 16:39:17 -07:00
qml	Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor	2018-10-23 13:28:35 -07:00
QtWebEngine/UIDelegates	Revert "Better imports for controls and styles"	2018-10-23 10:58:28 -07:00
serverless	new location drop - unparent overlays	2018-09-26 15:12:48 -07:00
shaders	Alternate shader	2018-05-04 16:40:05 -07:00
snapshot/img
sounds
styles
visage