Commit graph

732 commits

Author SHA1 Message Date
David Rowe
a3e677e64f Code review 2018-07-20 08:32:21 +12:00
David Rowe
5e624246a8 Fix HMD.mountedChanged() API signal 2018-07-19 13:00:57 +12:00
Alexander Ivash
57f32e64c1 remove the code of the rendering vive controllers and any code that uses that menu option. 2018-07-06 21:00:56 +03:00
Alexander Ivash
eb97f99db1 Revert "commented out code responsible for creating / populating 'Avatar' menu (per request from Mukul)"
This reverts commit d40d1a9985770d2da82f5291ee33a7cfe8a73652.
2018-07-06 21:00:55 +03:00
Alexander Ivash
bc6bfc1003 commented out code responsible for creating / populating 'Avatar' menu (per request from Mukul) 2018-07-06 21:00:55 +03:00
Brad Davis
197fb469eb Fix touch controller button handling when Oculus remote is paired 2018-06-15 10:16:32 -07:00
John Conklin II
287fd67e67
Merge pull request #13313 from dback2/gamepadEnabled
Enable gamepad by default
2018-06-07 12:42:04 -07:00
Bradley Austin Davis
e38059797d Update Oculus integration 2018-06-06 17:27:30 -07:00
David Back
c1dceda4ac enable gamepad by default 2018-06-05 12:01:06 -07:00
John Conklin II
6095a3b319
Merge pull request #13082 from jherico/feature/shader_cache
Shader load time performance optimiziations
2018-05-30 13:55:34 -07:00
Bradley Austin Davis
3beb77694f Cached shader binaries and uniform data for shaders 2018-05-24 12:42:33 -07:00
David Rowe
6d4f704279 Regularize some JSDoc usage 2018-05-21 09:32:10 +12:00
Anthony J. Thibault
ed726c9d77 OpenVR: Remove reference to HMD Standing Mode menu item
This menu item has not existed for over a year.
I was sometimes seeing a crash on startup when the display plugin
attempted to reference this menu item.
2018-05-14 13:51:13 -07:00
John Conklin II
5cd225e4de
Merge pull request #12947 from jherico/feature/splash2
Additional work on splash screen
2018-05-11 11:26:37 -07:00
Brad Davis
72526781d9 Additional work on splash screen 2018-05-04 16:40:05 -07:00
Clement
da9fb9c751 Fix non self-sufficient headers 2018-05-04 16:26:41 -07:00
John Conklin II
236e75b6c6
Merge pull request #12903 from druiz17/add-more-hmd-data
Get the correct device name connect to OpenVr
2018-04-24 13:29:41 -07:00
David Rowe
f865a13326 Doc review 2018-04-21 14:10:14 +12:00
David Rowe
748052614f Doc review 2018-04-21 12:45:00 +12:00
David Rowe
9f83c606e9 Controller API JSDoc 2018-04-17 11:46:40 +12:00
Dante Ruiz
aa985fa682 add-more-hmd-data 2018-04-16 15:30:28 -07:00
Dante Ruiz
5af1ea54d3 Merge branch 'master' of github.com:highfidelity/hifi into add-more-hmd-data 2018-04-16 10:10:55 -07:00
John Conklin II
5bd3d0fab9
Merge pull request #12647 from birarda/feat/client-only-installer
add a CLIENT_ONLY build option and handle for installer
2018-03-21 11:20:36 -07:00
Sam Gateau
4341347148
Merge pull request #12639 from SamGondelman/aa
Use correct platform-specific gpu library
2018-03-20 14:47:26 -07:00
Stephen Birarda
1405c8fcb3 add a client only option to cmake 2018-03-20 14:20:58 -07:00
Stephen Birarda
f8df90e36d disable the sixense plugin by default 2018-03-15 13:53:10 -07:00
SamGondelman
21381a7295 fix building with gles on desktop (still crashes) 2018-03-14 11:44:00 -07:00
Dante Ruiz
1bae22fed0 get actual name for OpenVrDispayPlugin 2018-02-28 16:32:53 -08:00
Dante Ruiz
1bc8484a4b determine OpenVr headset namme 2018-02-28 11:50:52 -08:00
Brad Davis
8853bd6388 Fix spectator camera crash 2018-02-14 11:11:28 -08:00
Andrew Meadows
342ba5f8aa add 'task' lib dependency to HMD plugins 2018-02-13 08:57:20 -08:00
Sam Gateau
714e3f445d
Merge pull request #11537 from jherico/threaded_qml
Migrating QML rendering off the main thread
2018-02-12 15:32:33 -08:00
John Conklin II
d084e58f48
Merge pull request #12328 from Atlante45/fix/misc-bugs
Misc bug fixes
2018-02-12 14:31:38 -08:00
Brad Davis
7d5502eb92 Migrating QML rendering off the main thread 2018-02-06 11:53:09 -08:00
Andrew Meadows
96c97547f9
Merge pull request #12205 from jherico/no_widgets
Remove some unneeded Qt dependencies
2018-02-05 15:32:54 -08:00
Atlante45
8ebb3e52d8 Misc bug fixes 2018-02-02 13:10:49 -08:00
samcake
f078ff611a Refining the declaraion signatures and adding the binary capture 2018-01-30 15:10:52 -08:00
Brad Davis
0781d8eaf0 Remove some unneeded Qt dependencies 2018-01-28 22:18:24 -08:00
Brad Davis
6a06bf405a Merge remote-tracking branch 'upstream/master' into android 2018-01-16 18:24:44 -08:00
humbletim
b91d536dd0 rename model:: -> graphics:: 2018-01-16 12:46:16 -05:00
humbletim
08ccda9cfc rename libraries/model(src/model) -> libraries/graphics(src/graphics) 2018-01-16 12:44:44 -05:00
Bradley Austin Davis
cb3456195e Fix OSX Oculus plugin 2018-01-15 10:48:39 -08:00
Brad Davis
acb95d1355 GLAD polish 2018-01-14 00:10:05 -08:00
Brad Davis
c924cbf2a7 Remove explicit gpu-gl dependencies 2018-01-13 12:20:41 -08:00
Brad Davis
22d133c71f Allow GLES client on desktop builds 2018-01-11 23:31:34 -08:00
Anthony J. Thibault
dd0e57026e Oculus Touch: More accurate spin on thrown objects
The internal computation of angular velocity was incorrect.
Apparently, the ovrPoseStatef.AngularRotation is not in sensor frame but local to the controller rotation.
2018-01-08 15:28:59 -08:00
Dante Ruiz
82fb58ed96 remove debug statement 2017-11-29 10:58:10 -08:00
Dante Ruiz
eba8a6e17b Merge branch 'master' of github.com:highfidelity/hifi into fix-vive-head-pose 2017-11-29 10:50:37 -08:00
Dante Ruiz
9a5f0dea95 better solution 2017-11-28 13:16:47 -08:00
Anthony J. Thibault
8364700b7a Head tracking bug fix for vive HMD users 2017-11-28 12:19:16 -08:00
Dante Ruiz
7daad29906 Merge branch 'master' of github.com:highfidelity/hifi into fix-vive-head-pose 2017-11-28 10:44:04 -08:00
Dante Ruiz
039abff861 fix viveControllerManager not registering the vive input is no hand controllers are present 2017-11-28 10:43:37 -08:00
MiladNazeri
83d13717fe
Merge pull request #11752 from Menithal/21539
21539: Add "None" option in Head Tracking section when "Use Vive in Desktop Mode" is selected
2017-11-27 16:02:01 -08:00
Menithal
5d52b9936b 21539: Updated Logic to match request 2017-11-27 07:42:18 +02:00
Menithal
e28f80401f 21539: Removed debug, added whitespace for format 2017-11-05 01:07:35 +02:00
Menithal
ac1df7b815 21539: Allow HMD to turned off in Desktop Mode 2017-11-05 01:02:08 +02:00
luiscuenca
70b37f2e8a Cleaning some old tabs 2017-10-27 11:32:44 -07:00
luiscuenca
f32282afdd Clean update bug 8027 2017-10-27 11:03:02 -07:00
Anthony J. Thibault
d8e2cbf871 Oculus: Bug fix for head offset on large/small scaled avatars. 2017-09-28 16:20:09 -07:00
Seth Alves
ae42d56cd6 Merge pull request #11465 from hyperlogic/bug-fix/teleporter-near-scale
Teleport.js: can now teleport small distances with small avatar scale
2017-09-26 19:05:14 -07:00
Bradley Austin Davis
e42068f681 Merge branch 'master' into android_new 2017-09-26 14:31:29 -07:00
Anthony J. Thibault
f081c36f25 ViveControllerManager: Code review feedback on PR #11422 2017-09-26 14:19:31 -07:00
Anthony J. Thibault
09c61deda8 Fixes for Vive puck calibration 2017-09-20 15:41:49 -07:00
Bradley Austin Davis
bc4193f276 Merge branch 'master' into android_new 2017-09-19 14:27:31 -07:00
Bradley Austin Davis
b93e91b9f3 New android toolchain 2017-09-19 13:45:12 -07:00
Anthony J. Thibault
f314ba38df Oculus: fix for lighting changes as avatar scale changes
The code was incorrectly NOT using the near and far clip distances when computing
the culling projection matrix. This projection matrix is used by the lighting system
to for deferred lighting, if it does not match actual projection used for
rendering into the g-buffer, the lighting will be incorrect.
2017-09-18 14:38:03 -07:00
Anthony J. Thibault
7e2b2960ed Fix for lighting as IPD scale changes.
(cherry picked from commit a260aaaae8)
2017-09-18 12:15:32 -07:00
Anthony J. Thibault
b81f85e1ae Merge branch 'master' into feature/ant-man 2017-09-11 15:14:03 -07:00
Bradley Austin Davis
48b6586d01 Modifying SDL initialization due to crash on OSX 2017-09-08 11:36:32 -07:00
Anthony J. Thibault
2f850826f2 Allow override of near/far clip planes in Oculus and OpenVR plugins 2017-09-06 11:02:44 -07:00
SamGondelman
4c55849290 merge from master 2017-08-10 15:43:23 -07:00
ZappoMan
87b2af25ba re-enable sixense and update comment 2017-08-10 12:03:56 -07:00
SamGondelman
489e08aef0 Merge branch 'master' of https://github.com/highfidelity/hifi into sharks 2017-08-07 13:29:00 -07:00
Anthony J. Thibault
98bbe887b9 Merge branch 'master' into feature/secondary-pose-support 2017-08-04 16:11:13 -07:00
SamGondelman
bd942ec406 merge from master 2017-08-04 12:17:54 -07:00
Brad Davis
5a7a6bab70 Remove PDB files, eliminate sixense 2017-08-02 14:08:46 -07:00
Anthony J. Thibault
2383933252 Merge branch 'master' into feature/secondary-pose-support 2017-07-31 10:55:40 -07:00
Andrew Meadows
d4e72df928 Merge pull request #10711 from burtsloane/midi
Midi support for Entities
2017-07-28 10:51:43 -07:00
Chris Collins
4684b388c7 Merge pull request #10987 from SamGondelman/hmd59Crash2
Fix crash when putting on HMD for Qt 5.9
2017-07-28 07:41:07 -07:00
Anthony J. Thibault
6c2b6674bb load and save shoulderConfig to settings. 2017-07-27 17:33:54 -07:00
Anthony J. Thibault
78c6564174 Merge branch 'master' into feature/secondary-pose-support 2017-07-27 09:09:32 -07:00
Anthony J. Thibault
8dc9714282 Pass armCircumference and shoulderWidth to qml. 2017-07-27 09:08:34 -07:00
Sam Gondelman
fcaa39b245 Merge branch 'master' into sharks 2017-07-26 18:18:09 -07:00
Anthony J. Thibault
2a45c6d3dc Removed eigen dependency, fixed Debug Draw IK Chains
Also, clarified for special case for secondary shoulder joint look-at constraint.
2017-07-26 16:55:12 -07:00
burtsloane
d4ae298a8d Merge branch 'master' into midi 2017-07-26 13:59:07 -07:00
Burt Sloane
4f7243e444 Merge branch 'master' of https://github.com/burtsloane/hifi into midi 2017-07-26 13:30:57 -07:00
Burt Sloane
d2975c79c9 add midi to 3 CMakeLists.txt for linking 2017-07-26 08:41:26 -07:00
Anthony J. Thibault
572213daaf Added shoulder config to Controller Settings UI
All offset values in Controller Settings UI are now in cm.
2017-07-25 17:05:07 -07:00
Anthony J. Thibault
c81875a280 Improved shoulder calibration using hard-coded measured shoulder width 2017-07-25 15:50:44 -07:00
Brad Davis
8d37e54a4e Merge pull request #11051 from highfidelity/qt59
Changes for Qt 5.9 warnings and build issues
2017-07-25 15:05:28 -07:00
Andrew Meadows
9d1fba3a3b Merge pull request #10821 from ctrlaltdavid/21418
Don't execute body of controllers' plugin update methods if not enabled
2017-07-25 08:51:17 -07:00
SamGondelman
3c8b964cc9 replace setHandLasers with drawHUDLayer overlay property 2017-07-24 18:16:40 -07:00
Anthony J. Thibault
9f6641ed10 Shoulder puck calibration work in progress
* AnimInverseKinematics: debug draw for secondary targets
* AnimInverseKienmatics: better clean up of ik target debug draw
* GeometryUtil: added findPlaneFromPoints()
* ViveControllerManager: external dependency on eigen
* ViveControllerManager: record history of left/right hand controllers
* ViveControllerManager: use history to determine user shoulder location for better calibration
* ViveControllerManager: pass defaultToReferenceMat by const ref to calibrate functions.
* CMake: added external depenency to eigen linear algebra library.
2017-07-24 17:22:48 -07:00
Brad Davis
3a31805dff Fix warnings in Qt 59 / VS 2017 build 2017-07-20 11:57:12 -07:00
Anthony J. Thibault
2e0bc36cfd warning fix + whitespace 2017-07-13 15:17:49 -07:00
Anthony J. Thibault
22d8adcb99 Better shoulder/arm puck calibration. 2017-07-13 10:39:48 -07:00
Anthony J. Thibault
eb486c8f47 comments 2017-07-06 11:03:03 -07:00
Anthony J. Thibault
4e9b8c1ef9 updated comments 2017-07-06 11:01:59 -07:00
Anthony J. Thibault
dee9769be3 Can now use chest, hips, shoulder & feet pucks in desktop mode.
* Fixed bug where head puck would sometimes not work properly when other vive trackers were enabled.
* Fixed calibration to work in sensor space instead of avatar space, this was necessary because
  the sensor to world matrix is unreliable when in desktop mode.
2017-07-06 10:54:03 -07:00
Anthony J. Thibault
8c15d1bab9 delete-trailing-whitespace 2017-07-06 10:54:02 -07:00