motofckr9k 3d05cdd61e Merge remote-tracking branch 'refs/remotes/kasen/master' ... Conflicts: BUILD_WIN.md CODING_STANDARD.md LICENSE cmake/installer/installer-header.bmp cmake/installer/installer.ico cmake/installer/uninstaller-header.bmp interface/resources/images/about-vircadia.png interface/resources/images/vircadia-logo.svg interface/resources/qml/LoginDialog.qml interface/resources/qml/dialogs/TabletLoginDialog.qml interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml interface/src/Application.cpp pkg-scripts/athena-server.spec scripts/system/more/app-more.js scripts/system/more/css/styles.css scripts/system/more/more.html		2020-06-10 02:49:13 +02:00
..
+android_interface	Use the new property	2019-12-07 08:29:21 +13:00
+webengine	Lots of renamings, more to come.	2020-04-07 04:56:02 -04:00
androidAppForce
controller
controls	cr round 2	2019-07-25 15:42:25 -07:00
controls-uit
controlsUit	Update interface/resources/qml/controlsUit/PermissionPopup.qml	2019-07-25 15:47:48 -07:00
desktop
dialogs	Fix tablet login dialog logo size.	2020-06-07 20:47:53 -04:00
hifi	Merge remote-tracking branch 'refs/remotes/kasen/master'	2020-06-10 02:49:13 +02:00
js
LoginDialog	Big rebrand	2020-05-22 20:35:27 +02:00
styles
styles-uit
stylesUit	Simplified UI v1	2019-05-10 10:49:25 -07:00
windows	Fix up scrollbars and separators	2020-01-23 11:25:48 +13:00
AnimStats.qml	Disable handTouch.js to prevent finger twitching	2019-06-20 15:52:36 -07:00
AudioScopeUI.qml
AvatarInputsBar.qml	Hide controls in top left; don't remove certain menus; fixup slider UIT	2019-05-13 17:26:19 -07:00
Browser.qml
BrowserWebView.qml
BubbleIcon.qml
ConnectionFailureDialog.qml
CurrentAPI.qml
ForceLoad.qml
InfoView.qml
InteractiveWindow.qml	Added extra attempt to parent interactive window content on creation	2019-10-29 11:20:14 -07:00
LoginDialog.qml	Height, width, and centering updates.	2020-06-06 18:40:19 -04:00
OverlayLoginDialog.qml
OverlayWindowTest.qml
QmlWebWindow.qml
QmlWebWindowView.qml
QmlWindow.qml
Stats.qml	Use the new property	2019-12-07 08:29:21 +13:00
StatText.qml	use bold monospace font for debug stats	2019-07-22 12:38:24 -07:00
TabletBrowser.qml
Tooltip.qml
UpdateDialog.qml	Big rebrand	2020-05-22 20:35:27 +02:00
Web3DSurface.qml	Steps closer...	2019-11-06 17:16:21 -08:00