Thijs Wenker c583c07d9c Merge branch 'feat/create/interactive-window' into feat/create/native-windows ... # Conflicts: # scripts/system/libraries/entityList.js # scripts/system/particle_explorer/particleExplorerTool.js		2018-07-03 18:47:38 +02:00
..
+android	Handle android back button. Remove unused resources. Fix compilation errors.	2018-04-19 17:31:25 -03:00
controller
controls	Fix MS15545: Fix PAL/GoTo WebView's Back Button	2018-06-18 10:19:00 -07:00
controls-uit	Fix MS15154: Remove focused button color	2018-06-19 09:56:24 -07:00
desktop	Fixed modality in Desktop	2018-05-17 16:11:28 +02:00
dialogs	Changed SpinnerSliderPreference.qml to general-case UI element as originally intended,	2018-06-29 15:22:57 -07:00
hifi	Merge branch 'feat/create/interactive-window' into feat/create/native-windows	2018-07-03 18:47:38 +02:00
js
LoginDialog	Adding Enter/Return for sign up dialog in pw field	2018-06-29 16:21:03 -07:00
styles
styles-uit	Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018	2018-04-16 10:11:44 -07:00
windows	Added mouse sensivity UI. Reworked advanced movements. TODO: properties interface complitely broken in Tablet mode	2018-05-01 21:22:48 +02:00
AudioScopeUI.qml	minimize diff	2018-03-29 11:24:31 -07:00
AvatarInputsBar.qml	Merge branch 'master' into move_to_qqc2	2018-03-24 15:32:04 +01:00
Browser.qml
ConnectionFailureDialog.qml
CurrentAPI.qml	Fix font loading for MacOS via different font loading method	2018-03-08 14:31:48 -08:00
ForceLoad.qml
InfoView.qml
InteractiveWindow.qml	- center default native window	2018-07-03 18:42:39 +02:00
LoginDialog.qml
OverlayWindowTest.qml	InteractiveWindow scripting API	2018-06-28 19:04:08 +02:00
QmlWebWindow.qml
QmlWindow.qml
Stats.qml	Add ideal resource texture memory stat	2018-05-18 09:23:53 -07:00
StatText.qml
TabletBrowser.qml
Tooltip.qml
UpdateDialog.qml
Web3DOverlay.qml