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
..
CollisionPick.cpp	Remove CollisionPick::computeShapeInfo	2019-11-05 10:57:54 -08:00
CollisionPick.h	Remove CollisionPick::computeShapeInfo	2019-11-05 10:57:54 -08:00
LaserPointer.cpp	Disambiguate pick and pointer types in the returned properties	2019-08-07 09:56:23 -07:00
LaserPointer.h	Disambiguate pick and pointer types in the returned properties	2019-08-07 09:56:23 -07:00
LaserPointerScriptingInterface.cpp	Improve pick/pointer debugging. Use unsigned int in Graphics api for compatibility	2019-08-02 16:10:39 -07:00
LaserPointerScriptingInterface.h	JSDoc fixes noticed in passing	2019-10-18 09:17:03 +13:00
MouseTransformNode.cpp	Fix some dates and no newline at EOF	2019-08-02 16:13:07 -07:00
MouseTransformNode.h	Fix some dates and no newline at EOF	2019-08-02 16:13:07 -07:00
ParabolaPick.cpp	more overlay wip	2019-01-25 11:10:11 -08:00
ParabolaPick.h	Improve pick/pointer debugging. Use unsigned int in Graphics api for compatibility	2019-08-02 16:10:39 -07:00
ParabolaPointer.cpp	Merge pull request #16025 from sabrina-shanman/picks_debug	2019-08-07 12:01:26 -07:00
ParabolaPointer.h	Disambiguate pick and pointer types in the returned properties	2019-08-07 09:56:23 -07:00
PathPointer.cpp	CR and fix deadlock	2019-02-13 16:19:39 -08:00
PathPointer.h	more overlay wip	2019-01-25 11:10:11 -08:00
PickScriptingInterface.cpp	DOC-208 revisions	2019-11-18 20:05:08 -08:00
PickScriptingInterface.h	Revise recent Picks.PICK_BYPASS_IGNORE JSDoc	2019-12-18 12:30:50 +13:00
PointerScriptingInterface.cpp	DOC-208 revisions	2019-11-18 20:05:08 -08:00
PointerScriptingInterface.h	Address some JSDoc issues identified by makitsune	2019-12-18 08:01:20 +13:00
RayPick.cpp	fix stylus gizmo intersection	2019-03-06 17:20:36 -08:00
RayPick.h	Improve pick/pointer debugging. Use unsigned int in Graphics api for compatibility	2019-08-02 16:10:39 -07:00
RayPickScriptingInterface.cpp	Improve pick/pointer debugging. Use unsigned int in Graphics api for compatibility	2019-08-02 16:10:39 -07:00
RayPickScriptingInterface.h	Merge branch 'master' into DOC-102	2019-07-11 16:38:23 +12:00
StylusPick.cpp	making requested changes	2019-03-07 10:27:16 -08:00
StylusPick.h	Make default copy constructors explicit	2020-01-19 00:20:49 +01:00
StylusPointer.cpp	Disambiguate pick and pointer types in the returned properties	2019-08-07 09:56:23 -07:00
StylusPointer.h	Disambiguate pick and pointer types in the returned properties	2019-08-07 09:56:23 -07:00