Andrew Meadows
6f6a7bcc44
wrap default scripts with local scope
2016-08-25 08:57:06 -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
Seth Alves
c85e8d0580
don't show equip sphere until hand is in position to equip. widen unequip/drop cone
2016-08-16 11:18:12 -07:00
Anthony J. Thibault
1ddbd7022a
Moved keyboardFocus, mouse/touch event methods from Reticle to Entities
2016-08-11 11:52:04 -07:00
Anthony J. Thibault
8dac45c99e
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-10 11:27:21 -07:00
Seth Alves
090a0a6e9a
only use hand-sphere vs equipped-item bounding box when deciding to auto-unequip
2016-08-05 18:01:48 -07:00
Seth Alves
e59c010642
speling
2016-08-05 15:39:20 -07:00
Seth Alves
dc22b579f7
adjust code that auto-unequips items when they are pulled too far from the equipping hand
2016-08-05 15:28:37 -07:00
Anthony J. Thibault
0ba34c5635
Remove input restrictions on grabbable web entities.
...
You no longer have to be grabbing a grabbable web entity to interact with it.
2016-08-05 15:25:54 -07:00
Anthony J. Thibault
1dd276c1a5
Improved support for button rollover and hover
...
Send a combination of mouse and touch events to the web browser entity.
* MouseMove events for when the trigger is not depressed. This will trigger mouse over and hover events within the browser
* Touch Begin, End, Update events when the trigger is squeezed. This will give us the iPad like scrolling behavior.
2016-08-05 11:32:50 -07:00
Anthony J. Thibault
90a06f0d40
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-05 11:05:10 -07:00
Chris Collins
be87f294d8
Merge pull request #8351 from thoys/fix-handcontrollergrab-grab-message
...
fix remote triggering handControllerGrab
2016-08-04 11:55:48 -07:00
Thijs Wenker
3a2b0ffa08
Fixes the handControllerGrab Hifi-Hand-Grab message. Was broken since the hotspot changes to handControllerGrab.js.
2016-08-03 00:47:28 +02:00
Anthony J. Thibault
6d768d8327
hand controllers send touch events instead of mouse events to web entities
...
This gives a much better experience when scrolling web content.
2016-08-02 15:23:46 -07:00
James B. Pollack
41aa485f11
one hand teleprt
2016-08-02 12:52:35 -07:00
James B. Pollack
108e7a2fc1
Merge remote-tracking branch 'upstream/master' into tweak_lazers
2016-08-02 12:25:27 -07:00
James B. Pollack
a7b8f2c9df
updates
2016-08-02 12:25:24 -07:00
Anthony Thibault
cf7450beb7
handControllerGrab and web entity input integration
2016-07-29 17:50:45 -07:00
Eric Levin
5167809342
release near and far grab at trigger click detent
2016-07-28 08:51:11 -07:00
Eric Levin
f37570dc9a
only pulse on release when held
2016-07-28 08:23:45 -07:00
Eric Levin
0f7f9990c2
Tuned haptic pulses for grab, release, equip, de-quip
2016-07-27 17:58:24 -07:00
James B. Pollack
6a72fe7df4
cleanup
2016-07-25 16:58:59 -07:00
James B. Pollack
05e3a8613a
colors back to blue and red
2016-07-25 16:28:47 -07:00
James B. Pollack
9240672c9d
change distance hold origin
2016-07-25 13:06:09 -07:00
Brad Hefta-Gaub
1802f8e7a2
Merge pull request #8298 from imgntn/lazzzers
...
Update hand controller laser colors
2016-07-23 13:50:38 -07:00
Chris Collins
e755528cf2
Merge pull request #8278 from sethalves/fix-equip-fly-away
...
fix equip fly-away
2016-07-22 16:47:31 -07:00
James B. Pollack
e81f65d992
colors
2016-07-22 10:54:57 -07:00
James B. Pollack
54109c6c6f
remove all the old visualization methods
2016-07-22 09:39:38 -07:00
James B. Pollack
1d3dc7b195
remove particle beam and lights
2016-07-22 09:19:13 -07:00
Seth Alves
be001a652f
when doing a parenting grab, zero velocity
2016-07-19 11:50:53 -07:00
Brad Hefta-Gaub
866ba2f185
Merge pull request #8273 from hyperlogic/bug-fix/far-grab-zoom
...
far-grabbed objects no longer fly away when the avatar body shifts
2016-07-19 10:40:48 -07:00
Anthony J. Thibault
212175bdaa
bug fix for far-grab pulling the object in the wrong direction
2016-07-19 10:23:00 -07:00
Anthony J. Thibault
69500643f3
bugfix for saving attach points
...
The feature to add transition from equip -> near-grab, in inadvertently broke attach point saving.
2016-07-18 14:17:32 -07:00
Anthony J. Thibault
659e1ff984
remove debug prints
2016-07-18 14:17:06 -07:00
Anthony J. Thibault
959a2f9915
far-grabbed objects no longer fly away when the avatar body shifts
...
Before this fix, a hand vector was being tracked that was the difference between the avatar's hand in avatar space with the avatar's hand
in avatar space the previous frame. This hand vector was used to move the grabbed object position. However, when the body shifts, objects
in the avatar's space will change rapidly, this would cause this hand vector to be incorrect and cause the object to shoot off in the distance.
Now, we track this hand delta in sensor a.k.a. room space. This is immune to the shifts caused by body shifting.
2016-07-18 13:10:16 -07:00
Anthony Thibault
c7c8046231
De-equip goes into a near grab instead of dropping the object.
2016-07-16 14:58:21 -07:00
Anthony Thibault
4b2fb546eb
Re-enable storing of attach points in user settings
...
* bug fix, use localOffset property of grabbed entity, which is dynamically updated as
the near grab action moves the entity.
2016-07-16 12:21:08 -07:00
Philip Rosedale
4925980cbb
Merge pull request #8255 from jherico/search_circle
...
Make search line termination a circle, like 2D UI
2016-07-15 17:51:50 -07:00
Brad Davis
1145c3b590
Smaller and hotter circle, per Philip
2016-07-15 17:45:16 -07:00
Seth Alves
a0e6654ac6
Merge pull request #8247 from hyperlogic/feature/grab-script-polish-part-deux
...
Grab Script Polish (part deux)
2016-07-15 17:34:50 -07:00
