Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 04:34:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
61937 commits 67 branches 56 tags 1.2 GiB
Commit graph

635 commits

Author SHA1 Message Date
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
David Rowe
cfd155c198 Merge branch 'master' into 21418 2017-07-06 16:56:10 +12:00
Dante Ruiz
07d098b95b coding standard fix 2017-07-05 19:45:52 +01:00
Dante Ruiz
275f48b65a another requested change made 2017-07-05 19:22:19 +01:00
Dante Ruiz
e567cf0196 made requested changes 2017-07-05 19:04:34 +01:00
Dante Ruiz
27a9880eff removed double add of head offset 2017-07-05 18:34:33 +01:00
Dante Ruiz
691b59ffff remove debug statments 2017-07-05 18:26:58 +01:00
Dante Ruiz
a417f74bad Merge branch 'calibration-ui-update' into vive-in-desktop 2017-07-03 16:56:58 +01:00
Dante Ruiz
5fbcd494be made final requested changes 2017-07-03 16:46:58 +01:00
Dante Ruiz
063984f573 Merge branch 'master' of github.com:highfidelity/hifi into calibration-ui-update 2017-07-03 16:44:47 +01:00
Dante Ruiz
6f30cb1825 Merge branch 'master' of github.com:highfidelity/hifi into vive-in-desktop 2017-07-01 00:48:49 +01:00
Dante Ruiz
51792769b5 finished vive in desktop mode 2017-07-01 00:48:36 +01:00
David Rowe
07697c5083 Merge branch 'master' into 21418 
# Conflicts:
#	interface/resources/qml/hifi/dialogs/GeneralPreferencesDialog.qml
#	interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml

Removed stray "Vive Controller Picks" configuration item which no longer exists.
 2017-07-01 11:19:00 +12:00
Dante Ruiz
309a03230c Merge branch 'calibration-ui-update' into vive-in-desktop 2017-06-30 23:43:59 +01:00
Dante Ruiz
577969481d head puck working 2017-06-30 23:43:12 +01:00
Brad Davis
31d2c9980e Merge pull request #10797 from ctrlaltdavid/21396 
Make Leap Motion a plugin
 2017-06-30 14:37:23 -07:00
Dante Ruiz
a749fa19ad made requested changes 2017-06-30 19:14:22 +01:00
Dante Ruiz
3e1aee4d8a saving work 2017-06-30 19:07:34 +01:00
Dante Ruiz
a7e4dc1473 clean up code 2017-06-28 23:51:00 +01:00
David Rowe
be0e1a75a4 User-friendly SDL2 controller name 2017-06-29 10:03:58 +12:00
David Rowe
88ed69a4a1 Code review 2017-06-29 08:58:27 +12:00
Dante Ruiz
a2df2f8472 added user activity status 2017-06-28 19:52:19 +01:00
Seth Alves
59e72470f3 Merge pull request #10793 from druiz17/wide-stance-fix 
MoCap wide stance fix for calibration
 2017-06-26 10:13:26 -07:00
David Rowe
72d712ac76 Add "enabled" setting for Sixense; bail in update if note enabled 2017-06-26 16:43:06 +12:00
David Rowe
361bc1ce03 Add "enabled" setting for SDL2 joystick; bail in update if not enabled 2017-06-26 16:00:18 +12:00
David Rowe
5abd254a58 Bail in Neuron plugin update if plugin not enabled 2017-06-26 15:58:14 +12:00
David Rowe
384e2cefdb Update make file per master changes 2017-06-24 09:53:58 +12:00
David Rowe
6e266dfbac Merge branch 'master' into 21396 2017-06-24 09:19:12 +12:00
Brad Davis
fe7d4b1d23 Remove dependency between codec plugins and UI 2017-06-23 12:25:18 -07:00
David Rowe
9f48a139cc Fix crash when enable Leap Motion 2017-06-23 18:37:48 +12:00
David Rowe
e1dcf01706 Better settings text 2017-06-23 17:33:02 +12:00
Dante Ruiz
b48efc4317 fixed wide stance issue 2017-06-22 22:48:32 +01:00
David Rowe
f633f074b3 Post-merge fix 2017-06-23 00:24:28 +12:00
David Rowe
6ff8aed5e3 Merge branch 'master' into 21396 2017-06-22 23:54:15 +12:00
David Rowe
3bdf267900 Implement fingers control 2017-06-22 23:32:06 +12:00
Dante Ruiz
c4699e00ca added hand offsets 2017-06-21 23:10:08 +01:00
Dante Ruiz
2c3db0fb91 finished calibration-ui 2017-06-21 01:07:12 +01:00
Dante Ruiz
13dff29bd5 adding calibration screen 2017-06-20 01:19:10 +01:00
Dante Ruiz
cfffb74a29 Merge branch 'master' of github.com:highfidelity/hifi into hand-pucks 2017-06-19 21:40:26 +01:00
Dante Ruiz
734cde33e7 better calibrate button 2017-06-19 21:40:09 +01:00
Brad Davis
ed6620fc51 Merge pull request #10718 from jherico/frame_thread 
Cleanup and refactoring
 2017-06-19 13:31:44 -07:00
David Rowe
61bb853cdd Fix hand position 2017-06-19 17:26:55 +12:00
David Rowe
cacc89e8b6 HMD hand positions and orientations 2017-06-19 17:21:44 +12:00
David Rowe
deae33fd1e Add setting for desktop "zero" height offset 2017-06-18 17:43:52 +12:00
David Rowe
2d1cc12bc5 Desktop hand positions and orientations 2017-06-18 16:40:55 +12:00
David Rowe
5b6a5525b6 Initial control of avatar hand positions 2017-06-18 13:03:54 +12:00
David Rowe
0d986b8dc2 Signal when Leap Motion is connected 2017-06-17 14:43:32 +12:00
David Rowe
8d84e86d19 Apply sensor location setting 2017-06-17 13:57:43 +12:00
David Rowe
5de585e320 Leap Motion activation 2017-06-17 13:56:44 +12:00
David Rowe
2ca4283828 Fix Leap Motion SDK access 2017-06-17 12:02:26 +12:00
Dante Ruiz
da29157a3c fixed merge conflict' 2017-06-17 00:40:50 +01:00
Dante Ruiz
2015f059c7 fixed hand calibration 2017-06-17 00:37:33 +01:00
Brad Davis
fece438602 Cleanup and refactoring 2017-06-15 18:58:56 -07:00
Dante Ruiz
07102cc98d improving the ui 2017-06-16 00:25:27 +01:00
David Rowe
febd0eaf98 Add Leap Motion settings 2017-06-16 10:58:11 +12:00
David Rowe
170cf8156f Add plugin ID 2017-06-16 10:11:08 +12:00
David Rowe
6b2fbbf5fe Add logging category 2017-06-16 10:05:33 +12:00
Dante Ruiz
a1782bf7d2 Merge branch 'controller-ui' into hand-pucks 2017-06-15 16:27:55 +01:00
Dante Ruiz
d65c0dfbac Merge branch 'master' of github.com:highfidelity/hifi into controller-ui 2017-06-15 16:24:59 +01:00
David Rowe
9c431a11af Set up Leap Motion plugin container 2017-06-15 17:50:07 +12:00
Dante Ruiz
ff422153b1 got hand working 2017-06-15 00:26:53 +01:00
Dante Ruiz
aa23986618 finxing rotation problem 2017-06-14 00:46:55 +01:00
Zach Pomerantz
607379980e update plugin api 2017-06-13 17:59:46 -04:00
Zach Pomerantz
a8f69bb2e0 Merge branch 'master' of github.com:highfidelity/hifi into audio/parity 2017-06-13 17:41:52 -04:00
Dante Ruiz
ef9a211f6e adding hand punck 2017-06-13 21:15:16 +01:00
Brad Davis
c3f664502a Add support for querying the desired output audio device for OpenVR 2017-06-13 10:57:10 -07:00
Dante Ruiz
e125e1f608 fix issue that caused jenkin to fail buiuling code 2017-06-13 00:37:32 +01:00
Dante Ruiz
f9f9aeac01 saving work 2017-06-13 00:29:45 +01:00
Bradley Austin Davis
1968ecbc8f Simplify eventBridge mechanism exposing functionality to web pages 2017-06-12 14:46:37 -07:00
Dante Ruiz
bbe675ab72 making final changes 2017-06-12 22:01:41 +01:00
Dante Ruiz
067fc9bb98 fixed merge conflict 2017-06-12 16:45:34 +01:00
druiz17
f6ef1443c8 some more clean up 2017-06-11 12:08:45 -07:00
Dante Ruiz
ef1be931dc preparing to clean code 2017-06-10 00:50:32 +01:00
Seth Alves
485df396ef Merge pull request #10628 from jherico/qt59 
Fixes for Qt 5.9 compatibility
 2017-06-08 16:51:08 -07:00
Dante Ruiz
73e628461e confiration update status 2017-06-09 00:44:05 +01:00
Dante Ruiz
c97ea84cbf saving work 2017-06-08 17:44:55 +01:00
Dante Ruiz
11409aae9b connect the ui with the input plugins 2017-06-08 00:34:52 +01:00
Seth Alves
b1c7c251ac Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-06-07 10:09:46 -07:00
Dante Ruiz
4ba1fdc323 elimated uncofigurable items from the list 2017-06-07 00:48:12 +01:00
Bradley Austin Davis
a36727732f Fix bad initializer 2017-06-06 15:02:16 -07:00
Dante Ruiz
bb7c424d47 get ui working 2017-06-06 21:09:09 +01:00
NeetBhagat
c3621d7c32 Resolved two issues: 
1) While in HMD mode -> open Tablet -> Click Desktop.  Desktop mode will be on.
2) Menu sync problem while switching modes.
 2017-06-06 22:31:14 +05:30
Seth Alves
ad1ee97324 remove cruft 2017-06-06 09:50:40 -07:00
Dante Ruiz
038ffe920a fixing merge conflicts 2017-06-06 16:42:08 +01:00
Dante Ruiz
19b134b0ac base ui working 2017-06-06 00:32:20 +01:00
Seth Alves
9654e007a6 most input plugins are not head or hand controllers 2017-06-02 16:31:08 -07:00
Seth Alves
3359a0a794 work on fixing some head to eye offsets. MyHead::getHmdOrientation to MyHead::getHeadOrientation 2017-06-02 15:29:20 -07:00
Seth Alves
9088e288e0 don't worry about head controller being enabled, just check to see if head pose is valid 2017-06-02 13:57:53 -07:00
NeetBhagat
e08c3453a4 Merge branch 'master' into 21255 2017-06-02 12:36:07 +05:30
Seth Alves
27664756de with vive head-puck, isHeadController is true, even when HMD isn't mounted 2017-06-01 16:37:04 -07:00
Seth Alves
48ee546545 Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-06-01 16:15:03 -07:00
Seth Alves
7d21ab88b0 add some saftey checks. cleanups 2017-06-01 16:14:59 -07:00
anshuman64
694d1d042d Merge pull request #10573 from druiz17/head-puck 
Added head puck configuration
 2017-06-01 16:06:00 -07:00
Seth Alves
f45db99149 for the moment, vive input plugin isn't a head-controller unless the HMD is being worn 2017-06-01 14:35:53 -07:00
Seth Alves
552b69bb1c cleanups 2017-06-01 13:47:19 -07:00
Seth Alves
ac6135387c display plugins are never head controllers 2017-06-01 13:37:16 -07:00
Seth Alves
eb94c48c5b merge from upstream 2017-06-01 10:10:11 -07:00
Sam Cake
07eb1d89e1 fixing the warning on macosx about the non portable file name 2017-05-31 23:59:44 -07:00