overte/interface/resources/qml
David Rowe ffeb37e7aa Merge remote-tracking branch 'hifi/master' into merge-hifi-master
# Conflicts:
#	CMakeLists.txt
#	README.md
#	cmake/externals/glad32es/CMakeLists.txt
#	cmake/externals/glad41/CMakeLists.txt
#	cmake/externals/glad45/CMakeLists.txt
#	cmake/externals/polyvox/CMakeLists.txt
#	cmake/externals/quazip/CMakeLists.txt
#	cmake/externals/vhacd/CMakeLists.txt
#	cmake/init.cmake
#	cmake/ports/hifi-deps/CONTROL
#	cmake/ports/sdl2/CONTROL
#	cmake/ports/sdl2/disable-hidapi-for-uwp.patch
#	cmake/ports/sdl2/enable-winrt-cmake.patch
#	cmake/ports/sdl2/fix-arm64-headers.patch
#	cmake/ports/sdl2/fix-x86-windows.patch
#	cmake/ports/sdl2/portfile.cmake
#	cmake/ports/sdl2/vcpkg-cmake-wrapper.cmake
#	cmake/ports/tbb/portfile.cmake
#	hifi_vcpkg.py
#	interface/src/avatar/MyAvatar.h
#	libraries/avatars-renderer/src/avatars-renderer/Avatar.h
#	libraries/avatars/src/AvatarData.h
#	libraries/entities-renderer/src/RenderableEntityItem.h
#	libraries/entities/src/EntityItem.cpp
#	libraries/entities/src/EntityItem.h
#	libraries/fbx/src/GLTFSerializer.cpp
#	libraries/graphics-scripting/src/graphics-scripting/Forward.h
#	libraries/networking/src/AddressManager.cpp
#	libraries/networking/src/DomainHandler.h
#	libraries/procedural/src/procedural/ProceduralMaterialCache.cpp
#	libraries/render-utils/src/HighlightEffect.cpp
#	libraries/render-utils/src/MeshPartPayload.cpp
#	libraries/render-utils/src/Model.cpp
#	libraries/render-utils/src/RenderShadowTask.cpp
#	libraries/script-engine/src/WebSocketClass.cpp
2020-04-09 16:46:27 +12:00
..
+android_interface Use the new property 2019-12-07 08:29:21 +13:00
+webengine Various URL updates + window title update. 2020-02-05 15:25:51 -05: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 Re-branding of help dialogs and tablet login 2020-01-14 00:33:29 +00:00
hifi Merge remote-tracking branch 'hifi/master' into merge-hifi-master 2020-04-09 16:46:27 +12:00
js
LoginDialog Merge remote-tracking branch 'hifi/master' into merge-hifi-master 2020-04-09 16:46:27 +12: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 adding proper logic for shield icon behavior 2019-04-17 20:19:21 -07:00
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 Updated interface login page 2020-01-08 16:21:25 +00: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
Web3DSurface.qml Steps closer... 2019-11-06 17:16:21 -08:00