Wayne Chen 0a7102b4d3 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged		2018-10-04 08:59:26 -07:00
..
avatar	remove tabs from avatar-animation.json	2018-09-10 10:49:43 -07:00
config
controllers	prevent right-click strafe with ctrl	2018-07-06 10:52:53 -07:00
fonts	Merge pull request #13386 from ElderOrb/FB13949	2018-07-09 15:20:18 -07:00
html	removing debug print statements	2018-07-11 11:58:17 -07:00
icons	Small bugfixes and using original endpoints	2018-09-19 16:15:59 -07:00
images	adding buttons	2018-10-02 17:47:09 -07:00
mention-sounds
meshes	Revert "Revert "Merge branch 'master' into fixGoToButtonInterstitial""	2018-09-13 17:21:07 -07:00
qml	Merge pull request #14075 from ctrlaltdavid/M18586	2018-10-03 11:02:33 -07:00
QtWebEngine/UIDelegates
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	new local reference to image model	2018-02-02 10:27:44 -08:00
sounds	Fix paths to various Snapshot resource files	2018-04-17 14:13:14 -07:00
styles	Some improvements to the log window	2018-02-08 11:26:02 -08:00
visage