overte/interface/resources/qml/hifi/avatarapp
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
AdjustWearables.qml Remove further related dead code 2019-11-19 10:31:54 +13:00
AvatarAppHeader.qml cherry-picking 2018-11-06 14:21:14 +05:30
AvatarAppStyle.qml cherry-picking 2018-11-06 14:21:14 +05:30
AvatarsModel.qml Style changes as requested 2020-02-11 21:50:40 -05:00
AvatarThumbnail.qml Remove URL logging from JS and QML 2018-11-06 15:09:24 -08:00
AvatarWearablesIndicator.qml cherry-picking 2018-11-06 14:21:14 +05:30
BlueButton.qml cherry-picking 2018-11-06 14:21:14 +05:30
CreateFavoriteDialog.qml Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-08 09:57:10 -08:00
DialogButtons.qml bulk adjusting to coding guidelines 2018-08-22 00:42:01 +03:00
InputField.qml cherry-picking 2018-11-06 14:21:14 +05:30
InputTextStyle4.qml cherry-picking 2018-11-06 14:21:14 +05:30
MessageBox.qml Update avatar packager styling 2018-12-27 00:13:45 -08:00
MessageBoxes.qml Merge remote-tracking branch 'hifi/master' into merge-hifi-master 2020-04-09 16:46:27 +12:00
PageIndicator.qml use numeric animation for avatar bookmark & page indicator 2018-07-06 21:00:54 +03:00
RoundImage.qml show spinner during avatar thumbnails loading 2018-07-06 21:00:54 +03:00
Settings.qml Fixed MS21059: Avatar App Keyboard Raise in Desktop 2019-02-12 09:45:51 -08:00
ShadowGlyph.qml cherry-picking 2018-11-06 14:21:14 +05:30
ShadowImage.qml cherry-picking 2018-11-06 14:21:14 +05:30
ShadowRectangle.qml cherry-picking 2018-11-06 14:21:14 +05:30
Spinner.qml moved missed QtWebEngine references to +webengines 2019-02-07 14:57:25 -08:00
SquareLabel.qml cherry-picking 2018-11-06 14:21:14 +05:30
TransparencyMask.qml Fix avatar thumbnails 2018-10-02 16:31:24 -07:00
Vector3.qml cherry-picking 2018-11-06 14:21:14 +05:30
WhiteButton.qml cherry-picking 2018-11-06 14:21:14 +05:30