David Rowe e29b403abc Merge branch 'master' into M18586 ... # Conflicts: # interface/src/raypick/PointerScriptingInterface.cpp # interface/src/raypick/PointerScriptingInterface.h # interface/src/raypick/StylusPointer.h # libraries/pointers/src/Pointer.h # scripts/system/controllers/controllerModules/teleport.js		2018-09-24 11:44:28 +12:00
..
disableOtherModule.js
equipEntity.js
farActionGrabEntity.js	fix ray-pick results on entities with non-default registration point. clean up grab scripts to correctly use this fix.	2018-08-27 16:21:01 -07:00
farActionGrabEntityDynOnly.js	fix ray-pick results on entities with non-default registration point. clean up grab scripts to correctly use this fix.	2018-08-27 16:21:01 -07:00
farParentGrabEntity.js	fix ray-pick results on entities with non-default registration point. clean up grab scripts to correctly use this fix.	2018-08-27 16:21:01 -07:00
farTrigger.js
highlightNearbyEntities.js	switching near grab priority to be before web surface laser	2018-07-17 15:38:56 -07:00
hudOverlayPointer.js
inEditMode.js	Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192	2018-08-21 11:18:17 -07:00
inVREditMode.js	switching near grab priority to be before web surface laser	2018-07-17 15:38:56 -07:00
mouseHighlightEntities.js
mouseHMD.js	fixing invisible cursor	2018-06-13 11:31:14 -07:00
nearActionGrabEntity.js	Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192	2018-08-21 11:18:17 -07:00
nearGrabHyperLinkEntity.js	switching near grab priority to be before web surface laser	2018-07-17 15:38:56 -07:00
nearParentGrabEntity.js	staging changes	2018-09-11 15:23:40 -07:00
nearParentGrabOverlay.js
nearTrigger.js	switching near grab priority to be before web surface laser	2018-07-17 15:38:56 -07:00
scaleAvatar.js
scaleEntity.js
stylusInput.js
teleport.js	Merge branch 'master' into M18586	2018-09-24 11:44:28 +12:00
webSurfaceLaserInput.js	moving comment locations inside conditionals	2018-09-12 11:03:00 -07:00