overte/interface/resources/qml/hifi/tablet
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
..
+webengine Fix Blocks script displaying a blank page 2019-09-28 11:30:56 +12:00
tabletWindows Fix up scrollbars and separators 2020-01-23 11:25:48 +13:00
AvatarPackager.qml - rename functionality 2018-12-29 03:31:56 +01:00
BlocksWebView.qml fix blocks app 2019-02-12 16:45:45 -08:00
CalibratingScreen.qml rename stylues-uit => stylesUit & controls-uit => controlsUit 2018-11-06 14:21:14 +05:30
ControllerSettings.qml Upgraded OSC plugin with changes from ARKit blendshape work. 2019-11-19 13:13:56 -08:00
DynamicWebview.qml Add test for local file access 2019-08-29 13:45:43 -07:00
InputRecorder.qml rename stylues-uit => stylesUit & controls-uit => controlsUit 2018-11-06 14:21:14 +05:30
OculusConfiguration.qml track oculus controllers while in oculus home 2019-03-05 15:32:18 -08:00
OpenVrConfiguration.qml fix spinbox and adjusting OpenVrConfiguration spin boxes 2019-01-23 14:59:37 -08:00
TabletAddressDialog.qml Remove unused TabletAddressDialog internal property, fixing BUGZ-1294 2019-08-20 12:05:00 -07:00
TabletAudioBuffers.qml added workaround for bug in Qt StackView push method 2019-06-10 09:25:12 -07:00
TabletAvatarPreferences.qml added workaround for bug in Qt StackView push method 2019-06-10 09:25:12 -07:00
TabletButton.qml Tablet and related JSDoc 2019-06-07 08:34:53 +12:00
TabletGeneralPreferences.qml fix fix-snap-html-issue 2019-09-19 18:20:08 -07:00
TabletGraphicsPreferences.qml added workaround for bug in Qt StackView push method 2019-06-10 09:25:12 -07:00
TabletHome.qml wip for getting AvatarInputsBar to switch accordingly 2019-03-22 15:34:06 -07:00
TabletLodPreferences.qml added workaround for bug in Qt StackView push method 2019-06-10 09:25:12 -07:00
TabletMenu.qml moved missed QtWebEngine references to +webengines 2019-02-07 14:57:25 -08:00
TabletMenuItem.qml rename stylues-uit => stylesUit & controls-uit => controlsUit 2018-11-06 14:21:14 +05:30
TabletMenuStack.qml Fix crash using Settings in the Tablet in VR 2019-06-07 16:41:56 -07:00
TabletMenuView.qml rename stylues-uit => stylesUit & controls-uit => controlsUit 2018-11-06 14:21:14 +05:30
TabletModelBrowserDialog.qml rename stylues-uit => stylesUit & controls-uit => controlsUit 2018-11-06 14:21:14 +05:30
TabletNetworkingPreferences.qml added workaround for bug in Qt StackView push method 2019-06-10 09:25:12 -07:00
TabletRoot.qml changed quote types 2020-01-07 20:59:00 +00:00
TabletWebView.qml moved missed QtWebEngine references to +webengines 2019-02-07 14:57:25 -08:00
TADLightbox.qml Stand-alone Tags: Throw up popup for first unoptimized domain 2019-03-08 10:48:42 -08:00
WindowRoot.qml changed quote types 2020-01-07 20:59:00 +00:00
WindowWebView.qml moved missed QtWebEngine references to +webengines 2019-02-07 14:57:25 -08:00