Seth Alves ac475300f6 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui		2017-01-30 08:15:29 -08:00
..
avatar	Revert "Merge pull request #8691 from highfidelity/out-of-body-experience"	2016-12-05 15:18:03 -08:00
config	Remove antialiasing from menus, default to on	2016-02-23 16:24:44 -08:00
controllers	A and B buttons on oculus touch no longer trigger UI Nav events	2017-01-23 17:08:25 -08:00
fonts	Another checkpoint	2017-01-16 10:44:54 -08:00
html	Update oculus hand controller help image	2016-12-20 18:01:53 -08:00
icons	reference new users icon art	2017-01-25 14:43:39 -08:00
images	styling changes	2016-11-16 15:54:11 -08:00
mention-sounds
meshes	include tablet fbx with interface distribution rather than get it from s3	2017-01-26 10:20:46 -08:00
qml	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-30 08:15:29 -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	put name of button-click file back	2017-01-23 13:55:11 -08:00
styles
visage