James B. Pollack
c78dbe26b6
working initial beam, still trying to clear up no intersection beam issues
2016-07-05 17:25:21 -07:00
James B. Pollack
cbd1f8df88
add stuff for fading in/out and also for a nice stretchy beam
2016-07-05 13:11:14 -07:00
James B. Pollack
056e9e3a72
add teleport models etc
2016-07-05 10:31:47 -07:00
James B. Pollack
ac99ec04d0
Merge remote-tracking branch 'upstream/master' into viveteleporter
2016-07-05 10:28:07 -07:00
James B. Pollack
ff745a345e
remove dupe
2016-07-05 09:44:51 -07:00
James B. Pollack
f4d409f1e1
fix typo
2016-07-05 09:22:19 -07:00
James B. Pollack
9b822f97c0
end of day
2016-07-01 17:26:52 -07:00
James B. Pollack
00ce75ef48
more notes
2016-07-01 15:30:21 -07:00
James B. Pollack
9afc4d0c26
cleanup
2016-07-01 15:19:53 -07:00
James B. Pollack
ffbfc89e99
teleportr
2016-07-01 15:19:37 -07:00
James B. Pollack
4762091aaf
add easy mode
2016-07-01 11:12:20 -07:00
Ryan Downe Karpf
873b57219a
Merge pull request #8167 from hyperlogic/feature/equip-hotspots
...
equip-hotspots feature
2016-07-01 09:55:49 -07:00
James B. Pollack
b2e407a8e1
fix vive bug
2016-07-01 00:48:29 -07:00
James B. Pollack
104ee63a77
notes
2016-06-30 17:05:16 -07:00
James B. Pollack
82e074de0f
working teleporter
2016-06-30 16:05:44 -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
Howard Stearns
5556bbb0a3
Merge branch 'master' of https://github.com/highfidelity/hifi into update-invisible-reticle-only-when-triggered
2016-06-30 11:25:44 -07:00
Brad Hefta-Gaub
7dd53d7757
Merge pull request #8149 from howard-stearns/limit-hand-controller-actions-to-recommended-area
...
limit hand controller actions to recommended area
2016-06-30 11:06:32 -07:00
James B. Pollack
4b4e38a57c
end of day
2016-06-29 18:28:39 -07:00
Anthony J. Thibault
6072487c9c
Equip-points attachments work
...
Also made handControllerGrab.js eslint clean.
2016-06-29 17:28:53 -07:00
James B. Pollack
fd062d09dc
initial notes and research
2016-06-29 15:59:51 -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
Howard Stearns
b649b30777
Reduce margin.
2016-06-29 08:20:47 -07:00
Howard Stearns
b551bc3c1a
Use the whole area, less a margin.
2016-06-28 18:01:09 -07:00
Howard Stearns
d650c50a5b
Use normal Script.update (60hz) instead of a timer (@20hz).
2016-06-28 17:44:30 -07:00
howard-stearns
c492d125e0
limit hand controller actions to recommended area
2016-06-28 13:19:03 -07:00
howard-stearns
799686f29d
Only update the (invisible) cursor position from hand controllers when the
...
trigger is partially squeezed.
2016-06-28 11:36:08 -07:00
Anthony J. Thibault
41fcfb45ca
Merge branch 'vive-ui' into bug-fix/grab-visualization-improvements
2016-06-24 13:28:00 -07:00
howard-stearns
6a1dd235c9
Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into vive-ui
2016-06-24 12:49:54 -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
howard-stearns
f8391f0062
fix reticle bugs
2016-06-23 16:51: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
howard-stearns
223f9bda2e
gratuitous change to force things.
2016-06-21 17:03:49 -07:00
Howard Stearns
7e88772e85
Merge pull request #8106 from howard-stearns/triggering-change
...
triggering change
2016-06-21 13:51:12 -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
howard-stearns
bfb697bc77
No hysteresis.
2016-06-20 17:04:23 -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
Anthony J. Thibault
408f65100b
Bug fix for dropping near-grabbed entities via thump press.
2016-06-20 13:34:05 -07:00
Anthony J. Thibault
8792812884
Change raw for loop to Array.prototype.forEach instead
2016-06-20 13:26:41 -07:00
howard-stearns
cd1780efef
brush clearing
2016-06-20 13:21:06 -07:00
Anthony J. Thibault
359483d9ba
coding standard fix
2016-06-20 11:43:42 -07:00
