Anthony J. Thibault 80dea6831c Merge branch 'plugins' of github.com:highfidelity/hifi into sam/vive-hand-controllers ... Conflicts: interface/src/Application.cpp libraries/input-plugins/src/input-plugins/SixenseManager.cpp		2015-07-20 15:18:23 -07:00
..
config	Add import configuration	2014-01-10 23:26:58 +01:00
fonts	Breaking up offscreen UI work	2015-04-24 13:21:21 -07:00
html	Info-view	2015-04-26 10:37:14 -07:00
icons	removed id "g3322" in start-script.svg because it is no longer used and causes a "link rect899 hasn't been detected!" message on script editor open.	2015-02-17 18:37:23 +01:00
images	Merge branch 'master' into plugins	2015-07-13 19:52:53 -07:00
info	repair usage of INI file for QSettings	2014-02-19 14:09:18 -08:00
mention-sounds	fixed mention sounds dir for deployment	2014-05-12 20:55:24 +02:00
meshes	Default avatar fixes.	2014-11-14 13:02:02 -08:00
qml	Working on line height	2015-07-17 14:33:32 -07:00
shaders	Fix for misaligned color/material textures when resolution is greater than the	2015-01-20 13:07:35 -08:00
sounds	Signal Audio.disconnected, and use new hello/goodbye sounds in resources.	2015-06-11 20:33:30 -07:00
styles	experimenting with input plugins	2015-06-30 09:52:54 -07:00