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
..
hifiCodec	Instrument HifiAC code with performance timers	2020-01-14 16:58:05 -06:00
hifiKinect	put a plugin-interface version into the meta data of each plugin. don't load plugins that don't match the current version.	2019-01-10 15:07:06 -08:00
hifiLeapMotion	put a plugin-interface version into the meta data of each plugin. don't load plugins that don't match the current version.	2019-01-10 15:07:06 -08:00
hifiNeuron	Github actions	2019-11-18 15:20:37 -08:00
hifiOsc	Fix several bugs for eye tracking from input plugins to function	2019-11-21 17:57:44 -08:00
hifiSdl2	Github actions	2019-11-18 15:20:37 -08:00
hifiSixense	put a plugin-interface version into the meta data of each plugin. don't load plugins that don't match the current version.	2019-01-10 15:07:06 -08:00
hifiSpacemouse	put a plugin-interface version into the meta data of each plugin. don't load plugins that don't match the current version.	2019-01-10 15:07:06 -08:00
KasenAPIExample	DeprecatedScriptPlugin => ExampleScriptPlugin	2019-07-26 01:32:09 -04:00
oculus	Fix oculus calibration screen crash if touch not on	2019-10-08 12:31:05 -07:00
oculusLegacy	Github actions	2019-11-18 15:20:37 -08:00
openvr	Fixed something thats for sure	2019-12-20 00:57:38 +00:00
opusCodec	Remove logging statement.	2020-01-19 15:40:23 -06:00
pcmCodec	put a plugin-interface version into the meta data of each plugin. don't load plugins that don't match the current version.	2019-01-10 15:07:06 -08:00
steamClient	put a plugin-interface version into the meta data of each plugin. don't load plugins that don't match the current version.	2019-01-10 15:07:06 -08:00
CMakeLists.txt	Merge remote-tracking branch 'hifi/master' into merge-hifi-master	2020-04-09 16:46:27 +12:00