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
BlocksWebView.qml
CalibratingScreen.qml
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
OculusConfiguration.qml
OpenVrConfiguration.qml
TabletAddressDialog.qml
TabletAudioBuffers.qml
TabletAvatarPreferences.qml
TabletButton.qml
TabletGeneralPreferences.qml	fix fix-snap-html-issue	2019-09-19 18:20:08 -07:00
TabletGraphicsPreferences.qml
TabletHome.qml
TabletLodPreferences.qml
TabletMenu.qml
TabletMenuItem.qml
TabletMenuStack.qml
TabletMenuView.qml
TabletModelBrowserDialog.qml
TabletNetworkingPreferences.qml
TabletRoot.qml	changed quote types	2020-01-07 20:59:00 +00:00
TabletWebView.qml
TADLightbox.qml
WindowRoot.qml	changed quote types	2020-01-07 20:59:00 +00:00
WindowWebView.qml