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
..
accountUtils.js	new treatment for hmd/tablet login	2018-10-12 14:17:23 -07:00
cloneEntityUtils.js	fix cloneEntity function	2019-03-11 12:38:54 -07:00
connectionUtils.js	Remove URL logging from JS and QML	2018-11-06 15:09:24 -08:00
controllerDispatcherUtils.js	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-04-01 14:52:21 -07:00
controllers.js	Move grab pseudo-properties (userData) into first-class EntityItemProperties.	2018-10-02 08:54:12 -07:00
dataViewHelpers.js
entityCameraTool.js	Fix jitter when start moving camera in edit mode focused on entity	2020-01-12 17:37:58 +13:00
entityIconOverlayManager.js	entity icons ignorePickIntersection when not visible	2019-05-09 14:16:59 -07:00
globals.js	pushing with new fix	2018-10-17 15:03:09 -07:00
gridTool.js	Working on new file structure	2019-06-24 14:01:51 -07:00
overlayUtils.js
pointersUtils.js	make CR changes	2018-12-12 13:29:32 -08:00
progressDialog.js
soundArray.js
stringHelpers.js
toolBars.js
ToolTip.js
touchEventUtils.js
Trigger.js
utils.js	Fixed space before function params	2019-07-02 15:08:34 -07:00
WebTablet.js	Remove now-unnecessary getEntityProperties() call from WebTablet.js	2019-12-01 21:46:35 +13:00
Xform.js