overte-JulianGro/libraries
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
..
animation Merge remote-tracking branch 'hifi/master' into merge-hifi-master 2020-04-09 16:46:27 +12:00
audio Update classes' JSDoc per @hideconstructor 2019-12-23 14:13:48 +13:00
audio-client Merge remote-tracking branch 'hifi/master' into merge-hifi-master 2020-04-09 16:46:27 +12:00
auto-updater
avatars Merge remote-tracking branch 'hifi/master' into merge-hifi-master 2020-04-09 16:46:27 +12:00
avatars-renderer Merge remote-tracking branch 'hifi/master' into merge-hifi-master 2020-04-09 16:46:27 +12:00
baking Merge pull request #16491 from sabrina-shanman/instancing 2019-11-13 12:53:10 -08:00
controllers Merge branch 'DOC-55-C' into api-docs 2020-01-14 18:04:32 +13:00
display-plugins merge with master and try to fix opacity mode stuff 2019-10-23 22:21:45 -07:00
embedded-webserver fix issue with .json.gz files failing to upload properly 2019-07-26 13:55:59 -07:00
entities Merge remote-tracking branch 'hifi/master' into merge-hifi-master 2020-04-09 16:46:27 +12:00
entities-renderer Merge remote-tracking branch 'hifi/master' into merge-hifi-master 2020-04-09 16:46:27 +12:00
fbx material entities support cullFaceMode and support gltf doubleSided 2019-12-12 23:01:57 -05:00
gl FIrst pass to clean up before pushing a pr: 2019-09-26 11:59:01 -07:00
gpu Code style fixes 2020-01-17 00:41:16 +01:00
gpu-gl Addressing review comments 2019-08-14 10:28:42 -07:00
gpu-gl-common Remove getRaw() from DepthTest 2020-01-14 23:00:08 +01:00
gpu-gles Cleaning up android build warnings 2019-09-27 09:19:52 -07:00
graphics Graphics API JSDoc 2019-12-23 09:07:35 +13:00
graphics-scripting Use the @hideconstructor tag in anticipation of it working 2019-12-23 14:27:34 +13:00
hfm properly implement alphaModes 2019-12-12 22:58:36 -05:00
image Merge pull request #104 from daleglass/implicit_copy_constructor 2020-02-08 14:45:44 -05:00
input-plugins Update Controller.Hardware.Keyboard JSDoc per new touchpad gestures 2019-12-18 12:20:05 +13:00
ktx Even better frame capture 2019-10-04 14:57:39 -07:00
material-networking Merge remote-tracking branch 'hifi/master' into merge-hifi-master 2020-04-09 16:46:27 +12:00
midi Replace links to docs.highfidelity.com 2020-01-24 10:18:55 +13:00
model-baker Fix model baking to work with new hfm::Shape material definition (1 2019-11-11 17:52:00 -08:00
model-networking Add recently added properties to caches' JSDoc 2019-11-26 17:00:13 +13:00
networking Merge remote-tracking branch 'hifi/master' into merge-hifi-master 2020-04-09 16:46:27 +12:00
octree Enable serverless domains via HTTP and HTTPS 2020-02-01 12:46:28 +13:00
oculusMobile
oculusMobilePlugin
physics Merge pull request #16507 from highfidelity/master 2019-11-18 13:54:33 -08:00
platform Remove useless variable 2019-08-14 11:54:39 -07:00
plugins working on moving display plugin lookup to audiodevices 2019-10-29 09:26:48 -07:00
pointers Fix misc. JSDoc typo 2019-12-06 21:27:50 +13:00
procedural Merge remote-tracking branch 'hifi/master' into merge-hifi-master 2020-04-09 16:46:27 +12:00
qml change Metaverse API from setting 2019-12-20 11:39:05 +01:00
recording Code review 2019-09-25 07:50:56 +12:00
render Workaround for Secondary camera crash 2019-12-19 23:31:10 +00:00
render-utils Merge remote-tracking branch 'hifi/master' into merge-hifi-master 2020-04-09 16:46:27 +12:00
script-engine Merge remote-tracking branch 'hifi/master' into merge-hifi-master 2020-04-09 16:46:27 +12:00
shaders Cleaning up android build warnings 2019-09-27 09:19:52 -07:00
shared Merge remote-tracking branch 'hifi/master' into merge-hifi-master 2020-04-09 16:46:27 +12:00
task Qt 5.13 warnings & fixes 2019-10-08 15:40:13 -07:00
test-utils
ui Merge remote-tracking branch 'hifi/master' into merge-hifi-master 2020-04-09 16:46:27 +12:00
ui-plugins
workload add workload job to help debug entity proxies 2019-11-12 10:35:16 -08:00