David Rowe 8dd8ebcbaf Merge branch 'master' into feature/eye-tracking-option ... # Conflicts: # plugins/openvr/src/ViveControllerManager.cpp		2020-07-11 08:14:13 +12:00
..
aristo	update urls for vive eye and hand tracking libraries, fix cmake for same	2020-04-26 12:27:18 -07:00
bullet3
draco
etc2comp
glad	fix more links	2020-04-19 22:50:51 +02:00
gli
glm	Don't let Linux build of glm with clang-9 fail due to stray semicolon	2020-04-26 21:54:05 +00:00
glslang
hifi-client-deps	Fix Linux targeting	2020-05-23 19:46:26 +12:00
hifi-deps	enable tbb for osx	2020-04-19 22:50:49 +02:00
hifi-host-tools
hifi-scribe
liblo
nlohmann-json
nvtt
openexr
openssl
openssl-android	Further work-arounds for "?" in URLs	2020-04-13 11:02:50 +12:00
openssl-unix
openssl-windows
openvr	Build OpenVR plugin on Linux	2020-05-23 14:53:43 +12:00
opus	Use newer opus to fix illegal instruction in libopusCodec.so	2020-06-07 12:51:38 +02:00
polyvox	fix more links	2020-04-19 22:50:51 +02:00
quazip	fix more links	2020-04-19 22:50:51 +02:00
sdl2
shaderc
spirv-cross
spirv-tools
sranipal	Include deveoper guidelines doc in Vive PRO Eye's SRanipal package	2020-06-27 07:24:38 +12:00
tbb	- disable osx GHA build for now	2020-04-19 22:50:50 +02:00
vhacd	fix more links	2020-04-19 22:50:51 +02:00
vulkanmemoryallocator
webrtc
zlib	update zlib port	2020-04-19 22:50:49 +02:00
.gitattributes