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
Anthony Thibault
e4794450c2
Disable attach point saving
2016-07-15 15:36:20 -07:00
Brad Davis
0d811c489a
Removing debug logging
2016-07-15 14:05:16 -07:00
Brad Davis
c462b8c387
Make search line termination a circle, like 2D UI
2016-07-15 13:51:14 -07:00
Brad Hefta-Gaub
7bb31fe075
Merge pull request #8240 from jherico/hand_controller
...
Menu & hand controller polish
2016-07-15 12:36:31 -07:00
Anthony J. Thibault
37d60c6c85
eslint clean
2016-07-14 15:58:13 -07:00
Anthony J. Thibault
31f1d69c43
Merge branch 'master' into feature/grab-script-polish-part-deux
2016-07-14 15:57:41 -07:00
Brad Hefta-Gaub
45aa78702c
Merge pull request #8217 from sethalves/fix-throwing
...
fix throwing
2016-07-14 15:52:41 -07:00
Anthony J. Thibault
6094fb3de3
Remember object attach point offsets in user settings
2016-07-14 15:51:05 -07:00
Anthony J. Thibault
eb5107d9a5
highlight the grabbed hotspot when the drop gesture is detected
2016-07-14 12:07:07 -07:00
Anthony J. Thibault
e62d34136d
Added haptics and hysteresis to drop gesture
2016-07-14 10:53:47 -07:00
Anthony J. Thibault
51cce939b3
removed shake to drop
2016-07-14 10:32:02 -07:00
Brad Davis
091e798267
Make hand pointer lasers 'click' on fully pressing and clicking the vive controller
2016-07-14 10:30:35 -07:00
Anthony J. Thibault
23ea85541c
Animate equip hotspots scale instead of alpha
2016-07-14 10:24:08 -07:00
Anthony J. Thibault
66830a0538
First pass at equip sphere animation
2016-07-13 19:44:51 -07:00
Anthony J. Thibault
f3ef2801b4
Support for model overrides for equip hotspots rendering
...
Bug fix for modelScale on hotspots
2016-07-13 19:13:40 -07:00
Anthony J. Thibault
0ce970408c
Fix for double rendering of equip hotspots
2016-07-13 19:13:40 -07:00
Anthony J. Thibault
848d5a8975
Reduce calls to Entity.getEntityProperties().
...
By using a single EntityProprtiesCache instance instead of one per controller.
2016-07-13 19:13:39 -07:00
Brad Hefta-Gaub
819cab4aab
Merge pull request #8158 from sethalves/raypick-avatars
...
Raypick avatars
2016-07-12 15:27:30 -07:00
Seth Alves
1999193907
split the grab script's deactivation on an entity into two parts -- one that happens during release and a delayed part which finishes up. This makes collisions with a thrower's capsule less likely
2016-07-12 11:42:58 -07:00
