Shannon Romano
f084021fdf
Merge pull request #14678 from hyperlogic/feature/hmd-avatar-alignment-type
...
Added HMD Avatar Alignment Type
2019-01-25 17:32:41 -08:00
Wayne Chen
1c6521486e
fixing compile errors
2019-01-25 13:56:56 -08:00
Wayne Chen
6f49914167
Merge branch 'oculusLoginFeature' of https://github.com/wayne-chen/hifi into oculusLoginFeature
2019-01-25 12:19:20 -08:00
Wayne Chen
635c7533b9
more code review feedback
2019-01-25 12:15:38 -08:00
Wayne Chen
c136f24181
Merge branch 'master' into oculusLoginFeature
2019-01-25 11:44:14 -08:00
Wayne Chen
0928b1bff1
code review feedback
2019-01-25 11:36:58 -08:00
Wayne Chen
9da7465698
readding render session, adding newlines for oculus failure
2019-01-24 15:33:50 -08:00
Anthony Thibault
a7a71e4286
Merge branch 'master' into feature/hmd-avatar-alignment-type
2019-01-23 15:52:20 -08:00
Wayne Chen
512805d48f
removing leftover variable
2019-01-23 14:45:41 -08:00
Wayne Chen
4cf90050b5
reverting old code
2019-01-23 14:39:58 -08:00
Wayne Chen
1ae2ddd926
dont setup another oculus session
2019-01-22 11:08:15 -08:00
Wayne Chen
4d61a65bbf
wrapping request nonce and userID with conditional
2019-01-21 09:48:12 -08:00
SamGondelman
59fafa1f5c
only do entitlements check once
2019-01-17 11:47:12 -08:00
Wayne Chen
ef63213d28
fixing linking account problems on oculus/steam, changing callback
2019-01-16 21:07:54 -08:00
Wayne Chen
bb61334c0d
Merge branch 'master' into oculusLoginFeature
2019-01-16 17:24:22 -08:00
Wayne Chen
d38a657c54
filling username with oculus username, checking create error
2019-01-16 17:05:54 -08:00
Wayne Chen
2d16e71e74
adding sending oculus ID including username
2019-01-16 17:05:52 -08:00
Wayne Chen
7e674ba3c4
better check for if oculus is running
2019-01-16 17:05:51 -08:00
Wayne Chen
ca0916886a
adding more qml for oculus login
2019-01-16 17:05:51 -08:00
Wayne Chen
39a68a88f0
fixing typos in callback implementation
2019-01-16 17:05:51 -08:00
Wayne Chen
ed39b43d3b
changing request to have a callback function passed
2019-01-16 17:05:51 -08:00
Wayne Chen
6bc1164d58
more wip on oculus login
2019-01-16 17:05:50 -08:00
Wayne Chen
4320f4cbe4
migrating platform plugin
2019-01-16 17:05:50 -08:00
Wayne Chen
a905310a58
more staging
2019-01-16 17:05:49 -08:00
Wayne Chen
704f005604
changing user id variable type
2019-01-16 17:05:49 -08:00
Wayne Chen
a24ebe2718
oculus functions live in the display plugin; display plugins update
2019-01-16 17:05:49 -08:00
Wayne Chen
970798705c
improving flow from Oculus API to login dialog wip
2019-01-16 17:05:48 -08:00
Wayne Chen
1af57bdba6
staging
2019-01-16 17:05:48 -08:00
Wayne Chen
ebb9cd7de6
adding new plugin
2019-01-16 17:05:48 -08:00
Wayne Chen
db06533018
adding more staging
2019-01-16 17:05:48 -08:00
Wayne Chen
c22ad2b15a
staging some oculus helper code
2019-01-16 17:05:47 -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
Anthony Thibault
5d606981de
Added HMD Avatar Alignment Type
...
Adds a new API to set this type, and an option to the Avatar App.
* "eye" - Match the user eyes with the avatar eyes. The previous default behavior.
If the avatar skull is larger then the user, it can cause the avatars body to lift off of the ground when the user looks down.
* "head" - Match the user head with the avatar head. The new default behavior.
This prevents the body from lifting off of the ground while wearing a large headed avatar. But can cause an offset between the users eyes and the avatars eyes.
2019-01-08 18:35:28 -08:00
David Rowe
84c6bb4797
Introduce optional timestamp into internal Controller axis values
...
This can be used to determine if consecutive identifical values should
be output.
2018-12-31 12:15:51 +13:00
amantley
bc78ebe05d
cleaned up the button event code for the proximity sensor button
2018-12-19 14:21:14 -08:00
amantley
d0802b9d62
fixed merge conflict in fbxserializer
2018-12-19 13:46:02 -08:00
amantley
a7510cbfbe
removed debug print statements
2018-12-19 13:43:50 -08:00
amantley
b8c0d6d9f9
removed print statement in application.cpp and added check of button flag in openvrhelpers.cpp
2018-12-19 12:00:40 -08:00
amantley
da05692e5d
added auto switch to vive, checking for the proximity button on vive, to do: make sure ik is off for the head when in desktop mode.
2018-12-18 18:53:48 -08:00
amantley
ff9b0a1ac4
added debug for hmd events
2018-12-17 16:18:43 -08:00
amantley
893e9649be
removed eye joint debug statements
2018-12-17 15:30:49 -08:00
amantley
cb672b878c
looking at vive user flag behaviour
2018-12-17 08:42:53 -08:00
sabrina-shanman
566d09dc9c
Add model preparation step to ModelCache using new library model-baker
2018-12-11 11:15:54 -08:00
Jamil Akram
bc5166d1d8
Merge pull request #14531 from hyperlogic/feature/drop-after-delay-out-of-range-tracking
...
Added DropAfterDelay strategy to Vive Tracker Calibration Dialog
2018-12-07 12:09:44 -08:00
John Conklin II
bbc8e4de70
Merge pull request #14534 from SamGondelman/vive
...
Case 20138: Fix vive crash
2018-12-06 14:28:24 -08:00
SamGondelman
58396b845f
move back to plugin thread
...
(cherry picked from commit 98d3f6a9d1191031cda1ff040e69093ef6824f1c)
2018-12-04 17:38:48 -08:00
SamGondelman
0c64d1227a
fix vive crash
2018-12-04 16:41:03 -08:00
Anthony Thibault
7f2e427584
Added DropAfterDelay strategy to Vive Tracker Calibration Dialog
...
This is a hybrid of None and Drop strategies.
Basically, if the puck is out of range for less then 1/2 a second we still use it, however any longer then that and we mark it as invalid.
2018-12-03 18:56:45 -08:00
Anthony Thibault
c0bf832e39
Head and Hand offsets for Vive Trackers now function as expected
...
In the Settings > Controller... > Calibration menu, when using head or hand trackers
The provided Y and Z offsets should function correctly now. This gives you the ability to adjust
the offsets of the pucks to the hands/head. For example: this allows you to wear the hand pucks on your forearms
rather then the backs of your palms.
2018-12-02 16:18:36 -08:00
