Commit graph

39 commits

Author SHA1 Message Date
James B. Pollack
f6984aaff8 clear timeout one more place 2016-08-02 14:42:21 -07:00
Brad Davis
317dee1b23 Fix decoration inflation 2016-07-15 16:15:53 -07:00
Brad Davis
8685b23610 When using the hand controller as a mouse, disable the navigation focus state in QML 2016-07-14 12:11:12 -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
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
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
howard-stearns
f8391f0062 fix reticle bugs 2016-06-23 16:51:15 -07:00
howard-stearns
223f9bda2e gratuitous change to force things. 2016-06-21 17:03:49 -07:00
howard-stearns
bfb697bc77 No hysteresis. 2016-06-20 17:04:23 -07:00
howard-stearns
cd1780efef brush clearing 2016-06-20 13:21:06 -07:00
howard-stearns
74a3db4e1c When setting Reticle.depth, don't assume that we're in the center of the
HUD.
2016-06-17 11:14:56 -07:00
Howard Stearns
faa2624ca7 Merge pull request #8081 from howard-stearns/continue-grabbing-through-overlays
Continue grabbing through overlays
2016-06-15 16:07:01 -07:00
howard-stearns
2c7642a367 Do not make ReticleClick when we enter an overlay with the trigger
pressed.
2016-06-15 12:28:42 -07:00
howard-stearns
6366ca7508 Go red for full trigger. 2016-06-15 11:08:59 -07:00
Howard Stearns
ae65790bf3 no laser (or mouse cursor) from hand controllers unless trigger squeezed 2016-06-14 18:07:08 -07:00
howard-stearns
5759c2d29d final 2016-06-14 11:28:44 -07:00
howard-stearns
dfd03d5e61 Prepare for working laser. But at this point, we still show the laser AND
the Reticle.
2016-06-13 17:15:51 -07:00
howard-stearns
4344a35c60 Use the new system pointer functionality. 2016-06-10 16:00:16 -07:00
howard-stearns
74c5ddd49f fix paused interactions with mouse 2016-06-07 09:50:10 -07:00
howard-stearns
3e919cb7ac cleanup 2016-06-03 10:42:02 -07:00
howard-stearns
84fa4402fd Click on full trigger, activate on partial trigger. 2016-06-01 14:03:49 -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
howard-stearns
c299aef8f2 fix 588, 558 2016-05-20 12:15:30 -07:00
Brad Hefta-Gaub
53956c8210 reduce log spam 2016-05-19 07:50:06 -07:00
howard-stearns
fa90d823d5 Turn off hand-controller pointer when Interface doesn't have focus. 2016-05-18 11:49:12 -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
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