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
Brad Hefta-Gaub
45aa78702c
Merge pull request #8217 from sethalves/fix-throwing
...
fix throwing
2016-07-14 15:52:41 -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
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
Seth Alves
367c26a5ee
wait a bit before resetting collides-with-my-avatar
2016-07-11 18:53:47 -07:00
Seth Alves
85cc5f8956
Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars
2016-07-11 18:02:18 -07:00
Seth Alves
84c5bef487
back to ignore more recent 3 frames. don't have released entities collide with myAvatar until 0.25 seconds after release
2016-07-11 17:02:11 -07:00
James B. Pollack
27f70e9d52
finish merge
2016-07-11 15:13:25 -07:00
Seth Alves
c034879b74
Merge branch 'master' of github.com:highfidelity/hifi into fix-throwing
2016-07-11 11:12:20 -07:00
Anthony J. Thibault
6f6fe5f244
reduced radius of grab sphere
2016-07-08 18:23:33 -07:00
Anthony J. Thibault
bec71e4af4
Went back to transparent spheres for equip points
2016-07-08 17:05:23 -07:00
Seth Alves
051616d7c3
experimenting
2016-07-08 16:16:06 -07:00
James B. Pollack
6249f3ed12
less changes to hand grab
2016-07-08 16:01:17 -07:00
James B. Pollack
4f899d8752
play nice with grab
2016-07-08 15:14:04 -07:00
James B. Pollack
5ca14b528b
remove prints and format
2016-07-08 15:08:44 -07:00
Anthony J. Thibault
c8d0decab7
Fix for far grab not working until after edit button is pressed
2016-07-08 14:47:13 -07:00
Anthony J. Thibault
7d1f52da70
Added glow effect to search beam
2016-07-08 14:33:22 -07:00
Anthony J. Thibault
9242147394
Merge branch 'master' into feature/grab-script-polish
2016-07-08 13:40:01 -07:00
James B. Pollack
24832df14a
changes
2016-07-08 13:13:32 -07:00
Anthony J. Thibault
1ec3472230
Model overlay dimensions fixes
...
At the moment model overlays will ALWAYS scale to fit their dimensions
Update handControllerGrab to account for this behavior.
2016-07-08 11:36:43 -07:00
James B. Pollack
1a46366557
uncomment
2016-07-07 19:23:04 -07:00
James B. Pollack
f8ff0da901
trying to fix interaction with grab script...
2016-07-07 19:22:42 -07:00
Anthony J. Thibault
0d454cd45e
Equip hotspots render when your hand is near them.
2016-07-07 17:28:23 -07:00
Seth Alves
6786a07ac2
Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars
2016-07-07 09:53:24 -07:00
Anthony J. Thibault
2db8160568
handControllerGrab improvements
...
* Made handControllerGrab eslint clean
* A model overlay is used instead of a sphere to draw equip hotspots.
* The equip hotspot model will grow in size by 10% when hand is near enough to equip it.
* The hand controller will now perform a haptic pulse when your hand is near enough to an equip hotspot.
* Near triggers events will also perform a haptic pulse
2016-07-06 15:46:14 -07:00
howard-stearns
110f5e9e2a
Don't compare distance when no intersection.
2016-07-06 15:08:57 -07:00
howard-stearns
b8e6572ebf
basic hand-controller editing
2016-07-05 17:00:54 -07:00
Seth Alves
5ab82cd7c8
Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars
2016-07-02 15:11:59 -07:00
Anthony J. Thibault
d8e5e3cbe4
equip bug fix
...
you should not be able to equip an object that is already equipped, with your other hand.
2016-06-30 16:00:18 -07:00
Anthony J. Thibault
82b1cba81d
equip improvements
...
Allow the user to equip an object while near or far grabbing it from the other hand.
2016-06-30 13:58:44 -07:00
Anthony J. Thibault
6072487c9c
Equip-points attachments work
...
Also made handControllerGrab.js eslint clean.
2016-06-29 17:28:53 -07:00
Anthony J. Thibault
43d4dba4c0
iterate over hotspots not entities.
...
This makes it possible to render multiple hotspots per entity.
Also, it will use the same logic to decide how to deal with overlapping entity
equip hotspots.
2016-06-29 13:53:07 -07:00
Anthony J. Thibault
1b98c73473
WIP, equip-points work but they don't use the proper attach point.
2016-06-29 13:53:06 -07:00
Anthony J. Thibault
b042210637
Addition of equipHotspots
2016-06-29 13:53:06 -07:00
Seth Alves
52d017ac74
undo previous change
2016-06-28 19:22:19 -07:00
Seth Alves
b782ae667c
when one hand adjusts something equippd in the other, print out the new local position and rotation in case a content-creator wants to update userData
2016-06-28 16:36:37 -07:00
Seth Alves
630d5cfc82
make trigger more sensitive, print out position and rotation when releasing something
2016-06-28 15:47:17 -07:00
Anthony J. Thibault
41fcfb45ca
Merge branch 'vive-ui' into bug-fix/grab-visualization-improvements
2016-06-24 13:28:00 -07:00
Anthony J. Thibault
8bf72f28da
Fix for grab script search ray length
2016-06-24 12:06:02 -07:00
Anthony J. Thibault
7bd553c09c
near grab logic to uses sphere vs entity box
...
instead of sphere vs sphere. Adjusted debug drawing accordingly.
2016-06-23 17:03:15 -07:00
Anthony J. Thibault
eabb8d08c0
Merge branch 'vive-ui' into feature/equip-hotspots
2016-06-23 15:42:55 -07:00
Anthony J. Thibault
fc42a3aef5
Grab script hotspot work
...
* Updated grab/equip logic to use sphere vs sphere tests, instead of sphere vs entity bounding box.
* Added debug flag for visualizing grab spheres.
* hotspot overlays are now updated as the objects they are attached to move.
* You can now use the search beam to near grab large objects, as well as the sphere sphere test.
* Optimized EntityPropertyCache to make a single call to Entities.getEntityProperties instead of three.
* Moved grab script options from the "Developer > Hands" menu to the "Developer > Grab Script" menu.
2016-06-23 15:36:47 -07:00
howard-stearns
581d87d653
feedback re magic numbers and variable name.
2016-06-22 16:40:10 -07:00
Anthony J. Thibault
2a82dddc2b
Draw attach points as if they were equip-hotspots
2016-06-21 17:36:36 -07:00
Anthony J. Thibault
972c292857
Fix for equip-hotspot being visible for whiteboard markers
2016-06-21 11:59:11 -07:00
Anthony J. Thibault
2ed88bca6d
Bug fix for bow and arrow.
...
* before this change the releaseEquip message was not getting sent to the bow,
which it would use to re-enable the grab script via the 'Hifi-Hand-Disabler' msg.
2016-06-20 17:24:36 -07:00
Anthony J. Thibault
8817bbea09
reduce log spam
2016-06-20 15:53:33 -07:00
Anthony J. Thibault
e5159ad213
Added "Developer > Hands > Drop Without Shake" menu option
2016-06-20 14:50:15 -07:00
