Andrew Meadows 51a9a99381 Merge hifi/master into hifi/out-of-body-experience		2016-10-24 08:13:42 -07: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	Merge pull request #8777 from hyperlogic/bug-fix/oculus-touch-fixes	2016-10-13 10:57:27 -07:00
fonts	New glyph for "has transparent"	2016-09-10 14:37:09 +12:00
html	Update gamepad help image	2016-10-17 12:43:39 -07:00
icons	New art.	2016-07-01 10:34:13 -07:00
images	remove obsolete file	2016-09-22 16:49:38 -07:00
info
mention-sounds
meshes	Integrated controller display from tutorial scripts + assets	2016-10-20 18:24:58 -07:00
qml	Add free GPU memory to the displayed stats	2016-10-23 13:07:38 -07:00
QtWebEngine/UIDelegates	Fix UI elements triggered by WebViews	2016-07-21 15:13:07 -07:00
shaders	Remove oglplus usage from OpenVR	2016-10-02 11:44:33 -07:00
sounds
styles
visage