David Rowe b1f49be790 Merge branch 'master' into 21742 ... # Conflicts: # scripts/system/libraries/entitySelectionTool.js		2018-02-13 10:04:32 +13:00
..
disableOtherModule.js
equipEntity.js	if hand is already in 'drop gesture' position when equipping something, don't unequip until the hand has been upright	2018-01-31 10:06:20 -08:00
farActionGrabEntity.js	fixing case when grabbed target is destroyed	2018-02-08 17:08:51 -08:00
farTrigger.js
hudOverlayPointer.js
inEditMode.js	Handle tablet entities and overlays not being available	2018-02-08 09:51:48 +13:00
inVREditMode.js	Handle tablet entities and overlays not being available	2018-02-08 09:51:48 +13:00
mouseHMD.js
nearActionGrabEntity.js
nearParentGrabEntity.js
nearParentGrabOverlay.js	Handle tablet entities and overlays not being available	2018-02-08 09:51:48 +13:00
nearTrigger.js
scaleAvatar.js
scaleEntity.js
stylusInput.js	Handle tablet entities and overlays not being available	2018-02-08 09:51:48 +13:00
teleport.js	fixing teleport module for sit script	2018-02-05 11:52:35 -08:00
webSurfaceLaserInput.js