Commit graph

446 commits

Author SHA1 Message Date
David Rowe
989cd2d169 Fix Linux build error 2020-07-11 15:59:16 +12:00
David Rowe
8dd8ebcbaf Merge branch 'master' into feature/eye-tracking-option
# Conflicts:
#	plugins/openvr/src/ViveControllerManager.cpp
2020-07-11 08:14:13 +12:00
David Rowe
6e1af6df73 Update copyright notices 2020-07-10 07:18:29 +12:00
David Rowe
96ae709720 Update copyrights 2020-07-06 20:40:55 +12:00
David Rowe
5e52812747 Prevent excessive logging of a SteamVR event on Linux 2020-07-06 20:01:28 +12:00
David Rowe
c2bb26e519 Typos etc. 2020-06-29 12:40:39 +12:00
David Rowe
24352a7189 Add JSDoc for Vive eyes and fingers controller properties 2020-06-29 11:32:05 +12:00
David Rowe
e2a7abe8a2 Remove unused code 2020-06-29 11:12:46 +12:00
David Rowe
cc73528d0b Make Vive PRO Eye code Windows-only 2020-06-29 11:12:22 +12:00
David Rowe
2e9a8e2b33 Add option to enable Vive PRO Eye eye tracking 2020-06-27 15:14:21 +12:00
David Rowe
e95dd3c2bd Fix Settings > Calibration dialog not functioning when HIFI_DEBUG_OPENVR 2020-06-27 12:32:57 +12:00
David Rowe
0f324ee9ae Merge branch 'v2020.2.2-rc' into feature/openvr-linux
# Conflicts:
#	plugins/openvr/CMakeLists.txt
#	plugins/openvr/src/ViveControllerManager.cpp
2020-06-19 16:27:53 +12:00
David Rowe
aaf9abdaef Add missing delete 2020-06-18 10:23:22 +12:00
David Rowe
ab4ff1e7aa Proper Linux command line parsing 2020-06-17 08:55:54 +12:00
David Rowe
350b5f217e Try removing Linux-specific argc, argv code 2020-06-16 10:02:19 +12:00
David Rowe
ce96fc61d6 Remove unused code 2020-05-24 13:16:26 +12:00
David Rowe
1ac184bd22 Fix further type errors 2020-05-24 13:16:15 +12:00
David Rowe
6981937697 Fix path to header file 2020-05-23 20:42:22 +12:00
David Rowe
343c6a4027 Fix Linux targeting 2020-05-23 19:46:26 +12:00
David Rowe
33a77a5dbd Fix further Linux errors 2020-05-23 19:08:16 +12:00
David Rowe
f2232b89f0 Address Linux build warnings and errors 2020-05-23 17:18:03 +12:00
David Rowe
74f50ce079 Fix Linux build error 2020-05-23 15:48:48 +12:00
David Rowe
b72d5bf80c Build OpenVR plugin on Linux 2020-05-23 14:53:43 +12:00
David Rowe
7634478aba Merge branch 'master' into feature/vive-pro-eye-tracking 2020-05-22 08:52:08 +12:00
David Rowe
c0e36b7960 Address code review comments 2020-05-16 14:37:40 +12:00
David Rowe
be8d97cbf7 Use new audio setting API values 2020-05-07 16:05:49 +12:00
David Rowe
f83ea58a10 Fix erroneous hard-coded audio setting string 2020-05-07 15:42:30 +12:00
David Rowe
da2aefb6b2 There are no longer so-called "high quality" overlays 2020-05-04 21:04:17 +12:00
Seth Alves
cb83e4e6c9 adjust to new eye matrix 2020-04-26 12:25:19 -07:00
Seth Alves
67f4811c2b blink actions were renamed 2020-04-26 12:24:47 -07:00
Seth Alves
a0031c6f10 eye and hand tracking for htc vive pro 2020-04-26 12:24:45 -07:00
Fluffy Jenkins
6563d32395 Fixed something thats for sure 2019-12-20 00:57:38 +00:00
Fluffy Jenkins
95c7998720 Changed code to correct type 2019-12-19 23:34:29 +00:00
Fluffy Jenkins
7d402f4bae Changed so it will fail to load VR straight away instead of trying so much it causes audio failures 2019-12-19 23:19:05 +00:00
Seth Alves
af14245d45 provide a way to get at _sensorResetMat from outside class 2019-09-17 09:43:18 -07:00
David Rowe
5624ba6e14 Fix JSDoc for some Controller.Hardware.Vive property names 2019-09-04 21:05:06 +12:00
Seth Alves
9baf4c7078 comfort mode -- squeeze vision to avoid sickness 2019-07-12 09:14:17 -07:00
David Rowe
407ce745d5 Merge branch 'master' into M22075
# Conflicts:
#	libraries/controllers/src/controllers/Actions.cpp
2019-04-27 10:51:13 +12:00
SamGondelman
c730e51d1e wip redo stencil work 2019-04-11 13:22:51 -07:00
David Rowe
59533d0f59 Controller JSDoc update 2019-04-10 08:51:14 +12:00
Sam Gondelman
660818aded
Revert "Case 20060: Grab correct stencil masks from display plugins" 2019-04-05 11:59:46 -07:00
Sam Gondelman
85bf1da0a1
Merge pull request #15266 from SamGondelman/stencil
Case 20060: Grab correct stencil masks from display plugins
2019-04-04 13:36:25 -07:00
Brad Davis
44fc0d21db Revert "Remove _compositeFramebuffer from display plugins"
This reverts commit cb311408c6.
2019-04-03 13:43:39 -07:00
SamGondelman
8d2495ef7a vive coordinates in clip space 2019-03-29 16:24:04 -07:00
SamGondelman
4ed7c09016 grab correct stencil masks from display plugins 2019-03-26 13:42:18 -07:00
Brad Davis
cb311408c6 Remove _compositeFramebuffer from display plugins 2019-03-12 12:20:20 -07:00
SamGondelman
f7a487a020 move materialcache et al to material-networking library 2019-02-08 10:28:07 -08:00
Anthony Thibault
a7a71e4286 Merge branch 'master' into feature/hmd-avatar-alignment-type 2019-01-23 15:52:20 -08:00
Seth Alves
fd09180776
Merge pull request #14645 from ctrlaltdavid/M19774-d
Make mouselook directly proportional to right-click mouse
2019-01-16 09:09:38 -08:00
Seth Alves
6a88941166 put a plugin-interface version into the meta data of each plugin. don't load plugins that don't match the current version. 2019-01-10 15:07:06 -08:00