Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-23 15:39:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
55929 commits 25 branches 0 tags 1.1 GiB
Commit graph

1563 commits

Author SHA1 Message Date
Menithal
c92e22fd20 21384: Added Menu Option 2017-06-14 19:05:00 +03:00
Menithal
53fe5736d8 21384: Initial Disable Flying 2017-06-14 18:24:45 +03:00
Andrew Meadows
321e307c9f Merge pull request #10609 from 1P-Cusack/21317 
WL21317 helper functions for getting into avatar coordinate space
 2017-06-12 11:18:29 -07:00
Chris Howe
08d93173f0 Minor code feedback changes, moving test scripts to developer/tests. 2017-06-09 11:07:56 -04:00
Seth Alves
3b47142592 fix bug that causes hmd avatar eyes to be all the way to the side when there's not another avatar to look at 2017-06-08 10:28:38 -07:00
howard-stearns
9cf027a68c pr feedback 2017-06-07 16:44:13 -07:00
howard-stearns
fa74daf875 Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor 2017-06-07 16:43:25 -07:00
Seth Alves
69520ff3db pull from upstream, code review 2017-06-07 10:28:02 -07:00
Chris Howe
8166fec0e0 Minor changes based on code review feedback 
See https://worklist.net/21317,
https://github.com/highfidelity/hifi/pull/10609 and
https://github.com/highfidelity/hifi/pull/10609#pullrequestreview-42090197
 2017-06-06 12:11:57 -04:00
Howard Stearns
3de243b093 Include the radius of the sphere at the avatar's feet. 2017-06-05 18:48:11 -07:00
Seth Alves
7a276f027f fix orientation used for 3d audio 2017-06-05 15:53:01 -07:00
Seth Alves
27669d44a7 in deriveBodyFromHMDSensor, avoid using invalid head pose 2017-06-05 08:58:40 -07:00
Howard Stearns
ca526e0776 git rid of a lambda 2017-06-05 07:11:25 -07:00
Howard Stearns
05f41fb4f8 cleanup 2017-06-04 08:13:12 -07:00
Howard Stearns
a0ea306aed cleanup, and include missing allowBackface parameter 2017-06-04 07:55:23 -07:00
Howard Stearns
fd01258c76 cleanup 2017-06-03 16:02:58 -07:00
Howard Stearns
02c46080f7 we don't need to force, but we do need some extra room for confined spaces 2017-06-03 15:43:14 -07:00
Howard Stearns
c48b729527 Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor 2017-06-02 18:05:20 -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
howard-stearns
6b2e4c5abc zaru stuff 2017-06-01 17:08:22 -07:00
Seth Alves
7d21ab88b0 add some saftey checks. cleanups 2017-06-01 16:14:59 -07:00
Seth Alves
552b69bb1c cleanups 2017-06-01 13:47:19 -07:00
howard-stearns
1068a4a9bd remove the optimization for upperId == lowerId. Doesn't work in zaru 
tunnels.
 2017-06-01 13:21:24 -07:00
Seth Alves
eb94c48c5b merge from upstream 2017-06-01 10:10:11 -07:00
Sam Cake
3c9b14ee94 Oene more fix 2017-05-31 23:26:20 -07:00
Sam Cake
03fdc1396c Fixing the warnings 2017-05-31 23:20:10 -07:00
howard-stearns
1e1dd3a633 checkpoint with working detector 2017-05-31 17:10:37 -07:00
Seth Alves
e37387f45c sync 2017-05-31 14:01:09 -07:00
Chris Howe
6edc6b2756 WL21317 
New MyAvatar functions to support converting from avatar joint space to
world space and vice versa. Added some tests to support these functions.
 2017-05-31 15:05:43 -04:00
howard-stearns
07ea2e271b hook into location changes 2017-05-30 14:59:19 -07:00
Seth Alves
ffe844a8e7 Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-05-30 13:42:20 -07:00
howard-stearns
92aeadd70f rotation of local capsule offset 2017-05-26 16:34:08 -07:00
howard-stearns
f694691efb add fixme comments and make isUp/isDown ordinary methods. 2017-05-26 16:15:18 -07:00
howard-stearns
4be31f1b18 thread safety 2017-05-26 15:31:59 -07:00
howard-stearns
7cee438298 Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor 2017-05-26 11:36:04 -07:00
howard-stearns
905b5261d1 If collisions are enabled, turn them off in safeLanding, and 
restore.
 2017-05-25 16:32:44 -07:00
Seth Alves
af5ba3a90a ask display-plugins if they are head-controllers 2017-05-25 15:14:10 -07:00
howard-stearns
ac8cb63419 clean and DRY 2017-05-25 14:34:24 -07:00
Dante Ruiz
108c444cc7 clean up code 2017-05-25 21:59:06 +01:00
howard-stearns
9d73d0c931 works with nested enclosing entities 2017-05-25 12:09:22 -07:00
Seth Alves
3823ece153 Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-05-25 10:57:46 -07:00
Seth Alves
bdbc6ddcc1 change some code to look at head-controller position rather than hmd position 2017-05-25 10:50:41 -07:00
howard-stearns
74c163d047 snapshot of safeLanding. Works as long as entities don't intersect. 2017-05-25 10:25:29 -07:00
Dante Ruiz
8cb9bfcc81 fixed merge conflict 2017-05-24 19:35:41 +01:00
Dante Ruiz
ac3c9655ec added arms 2017-05-24 01:28:08 +01:00
Dante Ruiz
0cbdeaa1e8 Merge branch 'master' of github.com:highfidelity/hifi into arm-pucks 2017-05-23 18:26:58 +01:00
Dante Ruiz
54d63f5155 Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter 2017-05-23 18:19:38 +01:00
Anthony J. Thibault
06c26f029a Merge branch 'master' into feature/faster-ik-iterations 2017-05-23 09:10:17 -07:00
Dante Ruiz
d98e7d5bc6 adding left and right arm 2017-05-23 00:26:12 +01:00