Andrew Meadows 6bb3dd6830 Merge hifi/master into hifi/out-of-body-experience		2016-11-14 15:08:04 -08:00
..
avatar	apply linearMoveBlend to idleToWalk transition to reduce foot sliding	2016-09-26 14:24:01 -07:00
config	Remove antialiasing from menus, default to on	2016-02-23 16:24:44 -08:00
controllers	fixed menu pop up delay	2016-11-07 17:16:24 +00:00
fonts	New glyph for "has transparent"	2016-09-10 14:37:09 +12:00
html	Update help window to auto select xbox or vive controller tab on availability of device	2016-11-01 13:43:55 -07:00
icons	New art.	2016-07-01 10:34:13 -07:00
images	Fix Blast screen typos	2016-11-14 12:06:25 -08:00
info
mention-sounds
meshes	Update being of light model	2016-10-28 14:56:36 -07:00
qml	Merge pull request #9055 from jherico/fix_stats	2016-11-11 13:31:55 -08:00
QtWebEngine/UIDelegates	Fix UI elements triggered by WebViews	2016-07-21 15:13:07 -07:00
shaders	hacking	2016-10-18 21:33:37 -07:00
sounds
styles
visage	css and cfg filetypes are text in .gitattributes	2015-10-20 13:58:44 -07:00