Seth Alves
34e4b4ae19
move haptic-pulse for when grab-point enters a grabbable entity to the right section of code
2016-09-06 15:37:37 -07:00
Seth Alves
215fd4ddfd
fix grab-point sphere for right hand
2016-09-06 15:15:46 -07:00
Seth Alves
43c98b3f1e
attempt to avoid a very-still far-grab leaving something non-dynamic in bullet upon release. adjust position of grab-point sphere
2016-09-06 14:42:53 -07:00
Seth Alves
b8b1127d55
merge from upstream
2016-09-02 15:11:21 -07:00
Brad Hefta-Gaub
cf242eca9f
Merge pull request #8537 from hyperlogic/feature/larger-marketplace-tablet
...
Marketplace tablet is a bit larger and lower DPI.
2016-09-02 08:45:29 -07:00
Seth Alves
9ef03b1205
avoid having auto-unequip code trigger during a teleport
2016-09-01 19:13:08 -07:00
Seth Alves
8505d1eeed
avoid a bootstrap
2016-09-01 17:51:02 -07:00
Seth Alves
da35281941
don't assume collides-with-dynamic during a multi-grab
2016-09-01 16:57:23 -07:00
Seth Alves
b1eb4c361d
if a hand is disabled while holding something, release it
2016-09-01 15:02:41 -07:00
Seth Alves
dd7e25441c
include which hand in grab messages
2016-09-01 14:58:37 -07:00
Seth Alves
a35e527128
try to fix far-trigger
2016-09-01 11:46:08 -07:00
Seth Alves
53ba190ca6
don't do auto-release test unless the hand is equipping
2016-09-01 09:57:46 -07:00
Seth Alves
47259ee053
find equip-points with controller position rather than hand
2016-08-31 16:52:46 -07:00
Seth Alves
78f54a7f33
get rid of some jitter in equipped items. do a better job of deciding when something equipped has been torn-away
2016-08-30 14:39:11 -07:00
Seth Alves
617880479a
Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions
2016-08-30 11:19:40 -07:00
Seth Alves
3a5f92d7a2
ignoreIK for equipping. change how auto-unequip searches
2016-08-30 11:16:13 -07:00
Brad Davis
eb0a8db0af
Merge pull request #8539 from hyperlogic/bug-fix/snappy-search-beam
...
When trigger is pulled, snap search beam to correct length instead of animating
2016-08-30 11:13:58 -07:00
Seth Alves
f4eee8d480
Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers
2016-08-30 09:12:53 -07:00
Anthony J. Thibault
e34aecde49
Bug fix for click events received by entity scripts
...
PointerEvent.isLeftButton should be true even on left button release events.
in a previous PR this behavior was changed. isLeftButton was used as a flag indicating the button state, which would be false on left button release events.
Because we have scripts that rely on the old behavior, I've changed it back to the original and introduced isPrimaryHeld properties instead.
2016-08-29 16:21:39 -07:00
Anthony J. Thibault
3ed11d2e5f
When trigger is pulled, snap search beam to correct length instead of animating.
...
This improves interaction on web browser tablets. Instead of the beam shooting
through the tablet and animating back to the surface, it starts at the correct length.
2016-08-29 13:22:57 -07:00
Anthony J. Thibault
dcd91d4398
removed debug flag
2016-08-29 12:04:48 -07:00
Anthony J. Thibault
0f42943bfb
Marketplace tablet is a bit larger and lower DPI.
...
Bug fix for grabbing/equipping large objects, they no longer will drop immediately
if your grab point is too far away from the grabbed entity position.
2016-08-29 11:55:04 -07:00
Seth Alves
be1332532f
disable debugging prints
2016-08-29 03:39:52 -07:00
Seth Alves
5daf334a0e
avoid extra grab-point spheres when resetting scripts
2016-08-27 20:42:03 -07:00
Seth Alves
d69e712bef
keep near-grab radius small but still allow large equip hotspots
2016-08-27 20:23:19 -07:00
Seth Alves
2a5d686a76
don't show grab-point sphere when near grabbing or equipping
2016-08-27 20:11:16 -07:00
Seth Alves
3355097bd0
handle another type of abandoned grab
2016-08-27 19:46:15 -07:00
Seth Alves
7dad303ce7
don't leave stray blue search sphere when near-grabbing
2016-08-27 19:25:05 -07:00
Seth Alves
765cd72e0e
fix code that prints relative offsets of an equipped entity after it's been adjusted by the other hand
2016-08-27 19:13:32 -07:00
Seth Alves
cfca32e0b4
fix code that notices and fixes an abandoned grab
2016-08-27 16:00:27 -07:00
Seth Alves
e4b2b7158f
hotspots with large radius work correctly, again
2016-08-27 09:30:26 -07:00
Seth Alves
acb04a0bc9
don't add children of controller joints until we know our avatar ID
2016-08-25 19:09:10 -07:00
Seth Alves
7c5b8cb75d
send faux joints to the avatar-mixer
2016-08-25 15:21:29 -07:00
Seth Alves
948b4b7a15
in search, consider distance from grab-point rather than from avatar-hand when selecting the closest entity
2016-08-25 13:46:52 -07:00
Seth Alves
0783629cde
grab-point sphere is a child of controller joint, so it doesn't jitter
2016-08-25 13:31:07 -07:00
Seth Alves
cab30651d0
cleanups
2016-08-25 09:47:14 -07:00
Andrew Meadows
6f6a7bcc44
wrap default scripts with local scope
2016-08-25 08:57:06 -07:00
Seth Alves
18852137b5
cleanups, avoid pop when grabbing
2016-08-23 17:06:53 -07:00
Seth Alves
dbe65df90b
merge from upstream
2016-08-23 16:42:02 -07:00
Anthony J. Thibault
b2dff8aa77
Easier to click buttons on web entities with shaky hand controllers
...
There is an angular and time dead spot on webEntity for scrolling vs clicking.
Currently, it's 150 ms and 3 degrees. See POINTER_PRESS_TO_MOVE_DELAY and POINTER_PRESS_TO_MOVE_DEADSPOT_ANGLE
* Fix for warnings when clicking on window.open() links in WebEntity
2016-08-23 10:19:49 -07:00
Brad Hefta-Gaub
21bc06f154
Merge pull request #8335 from hyperlogic/feature/hand-controller-web-entity-integration
...
handControllerGrab and web entity input integration
2016-08-23 09:59:25 -07:00
Anthony J. Thibault
ff4c194756
eslint fix
2016-08-19 15:31:57 -07:00
Seth Alves
ff95ef2492
ignoreIK flag on action-grabbable objects works again
2016-08-19 08:59:42 -07:00
Anthony J. Thibault
4db1687746
bug fix for when web-entity is deleted while being scrolled
2016-08-18 18:37:52 -07:00
Anthony J. Thibault
7b248b440a
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-17 13:55:12 -07:00
Anthony J. Thibault
7de8cc6422
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-16 16:49:57 -07:00
Seth Alves
7bc1235c54
local velocity and angular velocity in scripts is now handled the way local position and rotation are
2016-08-16 16:47:13 -07:00
Anthony J. Thibault
36d87ddd7c
Added EntityItem::wantsHandControllerPointerEvents method
2016-08-16 16:23:45 -07:00
Anthony J. Thibault
a595a72d0a
handControllerGrab now calls Entities.sendHoverLeaveEntity()
2016-08-16 15:39:02 -07:00
Anthony J. Thibault
c407818d63
send pointer events from handControllerGrab.js to webEntities
2016-08-16 15:26:14 -07:00
