howard-stearns
74c5ddd49f
fix paused interactions with mouse
2016-06-07 09:50:10 -07:00
Anthony J. Thibault
b836a580ff
Updated some debug print information
2016-06-06 14:40:58 -07:00
Anthony J. Thibault
6d462a477d
Change equip-hotspot to a green sphere.
2016-06-06 14:40:57 -07:00
Anthony J. Thibault
c9f440a49d
handControllerGrab: initial rendering of equip hot-spots
...
* When trigger is depressed, any entities that are marked with a wearable equip-point
will become highlighted by a wireframe box (temporary art).
* The grab state machine is now defined by the CONTROLLER_STATE_MACHINE object.
this includes each state's name and updateMethod name.
* Support was added for entry and exit methods when changing states, this
functionality is used to draw and delete the hot spots when entering
and exiting the searching state.
2016-06-06 14:40:57 -07:00
Brad Davis
b7d1659852
Merge remote-tracking branch 'upstream/master' into vive-ui
2016-06-06 09:32:33 -07:00
Brad Hefta-Gaub
eeb08fb401
Merge pull request #8014 from imgntn/leaphands
...
add leap hands to /system
2016-06-04 16:43:30 -07:00
SamGondelman
4fb8eac8ea
much better way of fixing script
2016-06-03 18:12:47 -07:00
James B. Pollack
da023bfbe3
leap
2016-06-03 15:40:04 -07:00
SamGondelman
2367cb1995
fixing input mapping for vive/touch grip button/trigger, script needs fixing
2016-06-03 15:07:21 -07:00
howard-stearns
3e919cb7ac
cleanup
2016-06-03 10:42:02 -07:00
howard-stearns
6d3fd4f208
Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into click-on-trigger
2016-06-01 14:17:27 -07:00
howard-stearns
84fa4402fd
Click on full trigger, activate on partial trigger.
2016-06-01 14:03:49 -07:00
howard-stearns
9ad19a2eaf
Draw grab balls in front of entities (not just the lines as before).
...
Don't intersect with grab balls (not just lasers as before).
Don't run grab lasers through (2d or 3d) overlays.
Don't try to manage reticle in handControllerGrab because other scripts
do.
2016-05-31 14:57:31 -07:00
howard-stearns
a3f1ece978
Do button mapping in C++ and simplify vive.json accordingly. Vive and
...
Hydra now use PrimaryThumb and SecondaryThumb. Fix warnings for Neuron.
2016-05-24 16:10:12 -07:00
howard-stearns
fdcd667d3c
Fix hand controller pointer after input changes.
2016-05-23 13:33:42 -07:00
Brad Hefta-Gaub
5906f88226
Merge pull request #7952 from sethalves/fix-walking-far-grab
...
fix distance-grabbing and walking at the same time
2016-05-20 16:54:52 -07:00
Seth Alves
a24d63a39c
make distance-grab work better when avatar is walking
2016-05-20 15:45:00 -07:00
howard-stearns
c299aef8f2
fix 588, 558
2016-05-20 12:15:30 -07:00
Brad Hefta-Gaub
8ff7af28be
Merge pull request #7925 from sethalves/overlay-or-grab-not-both
...
fix mouse-grab moving both an overlay and an entity at the same time
2016-05-19 17:38:32 -07:00
Brad Hefta-Gaub
53956c8210
reduce log spam
2016-05-19 07:50:06 -07:00
Seth Alves
b4df7cada7
don't mouse-grab things through an overlay
2016-05-18 16:16:31 -07:00
howard-stearns
fa90d823d5
Turn off hand-controller pointer when Interface doesn't have focus.
2016-05-18 11:49:12 -07:00
Seth Alves
009c288745
revert a change from previous fixes -- non-dynamic things should have to opt-into being grabbable. dynamic things have to opt-out
2016-05-12 13:29:40 -07:00
Brad Hefta-Gaub
757eea16a6
Merge pull request #7809 from howard-stearns/hand-controller-pointer
...
Hand controller pointer
2016-05-10 16:37:26 -07:00
Howard Stearns
64dc31cd61
switch statement whitespace
2016-05-10 09:43:00 -07:00
Howard Stearns
2b3f6506b7
more whitespace
2016-05-10 09:38:39 -07:00
howard-stearns
9edd18c017
Fix mouse seek bugs.
2016-05-09 14:05:59 -07:00
howard-stearns
6f4204ca5b
Remove alert for route remapping on hardware change.
2016-05-09 11:41:00 -07:00
Seth Alves
9db839bc13
don't allow someone else to delete an action that I own. reset dynamic property when releasing and entity, even if refCount isn't 0
2016-05-04 15:01:00 -07:00
Seth Alves
44beca1687
try having all spring derived actions agree on a target
2016-05-04 11:29:17 -07:00
howard-stearns
fdf9c0a217
Fix offset so that non-full-size window can be located anywhere on screen.
2016-05-03 16:26:45 -07:00
howard-stearns
eb0517f3cd
fix updateSeeking
2016-05-03 14:36:52 -07:00
Howard Stearns
5bd77bf343
Matching "final" version of test script.
2016-05-03 13:23:04 -07:00
Howard Stearns
773770a7fc
All but origin-correction.
2016-05-03 07:01:23 -07:00
Seth Alves
ec554c3c0b
Merge branch 'master' of github.com:highfidelity/hifi into grab-fixes
2016-05-01 17:28:20 -07:00
James B. Pollack
06171f6063
move default to system
2016-04-26 14:47:02 -07:00
