Brad Davis fbdb9b143e Merge branch 'ui-refactor' into m_and_m ... Conflicts: interface/resources/qml/HifiMenu.qml interface/resources/qml/MessageDialog.qml interface/resources/qml/Root.qml interface/resources/qml/TestRoot.qml interface/resources/qml/controls/Dialog.qml interface/src/Application.cpp interface/src/ui/LoginDialog.cpp libraries/ui/src/MessageDialog.cpp libraries/ui/src/MessageDialog.h libraries/ui/src/OffscreenQmlDialog.h libraries/ui/src/OffscreenUi.cpp libraries/ui/src/OffscreenUi.h tests/ui/src/main.cpp		2015-04-24 18:02:12 -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	editEntities.js --> edit.js	2015-03-27 14:40:16 -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	added go button active state icon	2014-09-24 23:26:34 +02: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	Merge branch 'ui-refactor' into m_and_m	2015-04-24 18:02:12 -07:00
shaders	Fix for misaligned color/material textures when resolution is greater than the	2015-01-20 13:07:35 -08:00
sounds	fixed mention sounds dir for deployment	2014-05-12 20:55:24 +02:00
styles	Remove custom styling	2014-08-23 00:16:25 +02:00
visage	Add Ryan's updated smoothing factors.	2014-03-21 10:38:29 -07:00