Seth Alves 90954a4e4f Merge branch 'master' of github.com:highfidelity/hifi into fix-parent-grab		2017-09-25 09:09:58 -07:00
..
disableOtherModule.js	Merge pull request #11380 from ctrlaltdavid/fix-controller-typos	2017-09-16 11:13:15 -07:00
equipEntity.js	fix some parent-grab bugs, re-enable adjusting equipped entities, don't trigger guns right when they are equipped	2017-09-21 11:07:47 -07:00
farActionGrabEntity.js	Updates to behavior and shader appearance	2017-09-22 11:24:30 -07:00
farTrigger.js	Merge branch 'master' into feature/ant-man	2017-09-18 11:36:39 -07:00
inEditMode.js	Merge branch 'master' into feature/ant-man	2017-09-18 11:36:39 -07:00
nearActionGrabEntity.js	fix some parent-grab bugs, re-enable adjusting equipped entities, don't trigger guns right when they are equipped	2017-09-21 11:07:47 -07:00
nearParentGrabEntity.js	back out bad change	2017-09-21 11:39:14 -07:00
nearParentGrabOverlay.js	fixing nearGrabParentModule switching grabbed overlays	2017-09-20 15:34:01 -07:00
nearTrigger.js	Merge branch 'master' into feature/ant-man	2017-09-18 11:36:39 -07:00
overlayLaserInput.js	Fix hover -> unhover overlay behavior	2017-09-22 13:32:11 -07:00
scaleAvatar.js	fix grab entity methods + jshint cleanups	2017-09-15 10:50:46 -07:00
tabletStylusInput.js	Merge pull request #11416 from druiz17/stylus-pos	2017-09-20 17:40:22 -07:00
teleport.js	Merge branch 'master' into feature/ant-man	2017-09-18 11:36:39 -07:00
webEntityLaserInput.js	Merge branch 'master' into feature/ant-man	2017-09-18 11:36:39 -07:00