overte/scripts/system/controllers/controllerModules
David Rowe a34e1f69e0 Merge branch 'master' into M19345
# Conflicts:
#	scripts/system/controllers/controllerModules/nearParentGrabOverlay.js
2018-11-09 14:26:29 +13:00
..
disableOtherModule.js Move grab pseudo-properties (userData) into first-class EntityItemProperties. 2018-10-02 08:54:12 -07:00
equipEntity.js rats 2018-10-25 07:47:16 -07:00
farActionGrabEntity.js Merge pull request #14249 from wayne-chen/mergedInterstitialBugFixes 2018-10-23 14:30:55 -07:00
farActionGrabEntityDynOnly.js Merge branch 'master' into M17853 2018-10-20 11:19:26 +13:00
farParentGrabEntity.js Merge branch 'master' into M17853 2018-10-20 11:19:26 +13:00
farTrigger.js Move grab pseudo-properties (userData) into first-class EntityItemProperties. 2018-10-02 08:54:12 -07:00
highlightNearbyEntities.js Move grab pseudo-properties (userData) into first-class EntityItemProperties. 2018-10-02 08:54:12 -07:00
hudOverlayPointer.js Merge branch 'master' into M16440 2018-10-19 09:06:33 +13:00
inEditMode.js 3D Keyboard 2018-11-08 09:58:53 -08:00
inVREditMode.js Fix tablet highlighting when using the Create and Shapes apps 2018-10-20 11:57:46 +13:00
mouseHighlightEntities.js Move grab pseudo-properties (userData) into first-class EntityItemProperties. 2018-10-02 08:54:12 -07:00
mouseHMD.js Move grab pseudo-properties (userData) into first-class EntityItemProperties. 2018-10-02 08:54:12 -07:00
nearActionGrabEntity.js Move grab pseudo-properties (userData) into first-class EntityItemProperties. 2018-10-02 08:54:12 -07:00
nearGrabHyperLinkEntity.js fix equip and keeping new functionallity 2018-09-21 15:59:00 -07:00
nearParentGrabEntity.js Move grab pseudo-properties (userData) into first-class EntityItemProperties. 2018-10-02 08:54:12 -07:00
nearParentGrabOverlay.js Merge branch 'master' into M19345 2018-11-09 14:26:29 +13:00
nearTabletHighlight.js Make tablet highlight not display if editing an entity with hand 2018-10-25 15:04:59 +13:00
nearTrigger.js Move grab pseudo-properties (userData) into first-class EntityItemProperties. 2018-10-02 08:54:12 -07:00
scaleAvatar.js Fix for hand controller avatar scaling. 2017-12-07 17:08:13 -08:00
scaleEntity.js Move grab pseudo-properties (userData) into first-class EntityItemProperties. 2018-10-02 08:54:12 -07:00
stylusInput.js Merge branch 'master' into M17853 2018-10-20 11:19:26 +13:00
teleport.js Merge branch 'fix-some-more-interstitial-issues' of https://github.com/danteruiz/hifi into mergedInterstitialBugFixes 2018-10-22 10:27:13 -07:00
webSurfaceLaserInput.js Merge pull request #14249 from wayne-chen/mergedInterstitialBugFixes 2018-10-23 14:30:55 -07:00