overte/interface/resources/qml/hifi
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 +android -> +android_interface 2019-02-06 11:37:52 -08:00
+webengine moved missed QtWebEngine references to +webengines 2019-02-07 14:57:25 -08:00
audio Fix up scrollbars and separators 2020-01-23 11:25:48 +13:00
avatarapp Merge remote-tracking branch 'hifi/master' into merge-hifi-master 2020-04-09 16:46:27 +12:00
avatarPackager Improve order of dialog contents 2020-01-05 18:24:56 +13:00
commerce Replace links to docs.highfidelity.com 2020-01-24 10:18:55 +13:00
dialogs Lint 2020-01-27 13:13:36 -05:00
models BUGZ-699: Make PSFListModel fetch early when making container bigger 2019-06-17 15:06:20 -07:00
overlays Merge pull request #12068 from vladest/move_to_qqc2 2018-04-12 11:26:55 -07:00
simplifiedUI DEV-2701: Remove the home icon from the profile app 2019-11-06 11:11:57 -08:00
tablet Merge remote-tracking branch 'hifi/master' into merge-hifi-master 2020-04-09 16:46:27 +12:00
toolbars Changed qml import method 2019-06-19 10:40:32 -07:00
tts Lotsa changes 2018-11-01 16:48:08 -07:00
AssetServer.qml Enable "Add To World" Asset Browser button for glTF 2019-01-22 17:01:06 -08:00
AvatarApp.qml Remove further related dead code 2019-11-19 10:31:54 +13:00
AvatarPackagerWindow.qml - error messages 2019-01-03 22:00:22 +01:00
Card.qml Case 21025 conditionalizing TabletWebView features 2019-03-15 12:56:43 -07:00
ComboDialog.qml rename stylues-uit => stylesUit & controls-uit => controlsUit 2018-11-06 14:21:14 +05:30
Desktop.qml better fix for the toolbar remnant 2019-06-12 14:31:43 -07:00
DesktopLetterboxMessage.qml rename stylues-uit => stylesUit & controls-uit => controlsUit 2018-11-06 14:21:14 +05:30
DesktopWebEngine.qml moved missed QtWebEngine references to +webengines 2019-02-07 14:57:25 -08:00
EditAvatarInputsBar.qml displaying offset values 2019-03-22 14:54:18 -07:00
Feed.qml Stand-alone Tagging: tagged places not coming first in GOTO list 2019-03-18 17:40:01 -07:00
LetterboxMessage.qml rename stylues-uit => stylesUit & controls-uit => controlsUit 2018-11-06 14:21:14 +05:30
NameCard.qml BUGZ-917: Fix log spam in NameCard.qml due to errant line of code 2019-07-05 12:24:05 -07:00
Pal.qml Case 20617 - People app filter bar breaks when deleting connections 2019-03-21 12:08:42 -07:00
RootHttpRequest.qml CR round 1 2018-11-08 10:05:57 -08:00
SkyboxChanger.qml rename stylues-uit => stylesUit & controls-uit => controlsUit 2018-11-06 14:21:14 +05:30
SpectatorCamera.qml Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-08 09:57:10 -08:00
TabletTextButton.qml rename stylues-uit => stylesUit & controls-uit => controlsUit 2018-11-06 14:21:14 +05:30
TextButton.qml rename stylues-uit => stylesUit & controls-uit => controlsUit 2018-11-06 14:21:14 +05:30