Dante Ruiz cde5208151 fixing merge conflict

2017-11-01 08:56:55 -07:00

..

disableOtherModule.js

Merge pull request #11380 from ctrlaltdavid/fix-controller-typos

2017-09-16 11:13:15 -07:00

equipEntity.js

implemented remebering equiping entities offset

2017-10-27 14:46:04 -07:00

farActionGrabEntity.js

removing more laserPointers

2017-10-31 14:13:42 -07:00

farTrigger.js

removing more laserPointers

2017-10-31 14:13:42 -07:00

hudOverlayPointer.js

completely removed non-need laserPointers

2017-10-31 15:57:57 -07:00

inEditMode.js

removing more laserPointers

2017-10-31 14:13:42 -07:00

inVREditMode.js

Code review

2017-10-05 18:21:04 +13:00

mouseHMD.js

improve mouseHMD exit logic

2017-10-05 15:12:58 -07:00

nearActionGrabEntity.js

Merge branch 'master' into 21568

2017-10-17 15:15:49 +13:00

nearParentGrabEntity.js

Replace usages of AVATAR_SELF_ID previously missed

2017-10-17 16:38:05 +13:00

nearParentGrabOverlay.js

Replace usages of AVATAR_SELF_ID previously missed

2017-10-17 16:38:05 +13:00

nearTrigger.js

set grabbable and other checkboxes correctly if userData is blank or malformed. near-trigger blocks near-grab

2017-09-26 18:56:27 -07:00

overlayLaserInput.js

removing more laserPointers

2017-10-31 14:13:42 -07:00

scaleAvatar.js

working on fix

2017-09-21 18:17:05 -07:00

scaleEntity.js

small change

2017-09-21 09:07:49 -07:00

tabletStylusInput.js

8315 Stylus appears in wrong place on hand

2017-10-26 19:39:15 +03:00

teleport.js

Merge remote-tracking branch 'upstream/master' into HEAD

2017-10-24 11:50:07 -07:00

webEntityLaserInput.js

completely removed non-need laserPointers

2017-10-31 15:57:57 -07:00