Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-12 18:15:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
3091 commits 76 branches 59 tags 1.2 GiB
Commit graph

3091 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
eb15aa602c Added amplification of gyro rates when applying to head, for more sensitivity, and to allow easily looking to one side and another 2013-05-23 12:17:24 -07:00
Philip Rosedale
7a0ea8bd59 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-23 11:48:18 -07:00
Philip Rosedale
8fec96319c Merge pull request #403 from Ventrella/master 
added effect of avatars floating above the ground with knees bent slightly
 2013-05-23 11:48:00 -07:00
Philip Rosedale
be1fae5958 Move head back to center when moving 2013-05-23 11:37:27 -07:00
Philip Rosedale
85ea48e43a Merge branch 'master' of https://github.com/worklist/hifi 2013-05-23 11:26:26 -07:00
Philip Rosedale
86e3e25663 removed commented line, formatting 2013-05-23 11:26:14 -07:00
Andrzej Kapolka
4e119419c3 Merge pull request #404 from ey6es/master 
Restore the original floor behavior so we don't sink into the ground.
 2013-05-23 11:16:16 -07:00
Andrzej Kapolka
672f4de496 Avoid colliding with gravityless environments. 2013-05-23 10:36:28 -07:00
Andrzej Kapolka
34b526f15c Restore the original floor behavior. 2013-05-23 10:32:12 -07:00
Jeffrey Ventrella
649fb72556 Merge remote-tracking branch 'upstream/master' 2013-05-23 10:15:18 -07:00
Jeffrey Ventrella
77324ebb46 made avatars appear to float above the ground 2013-05-23 10:14:46 -07:00
Andrzej Kapolka
1878ac8610 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-23 09:52:30 -07:00
Philip Rosedale
c56509e5a2 Re-enabled pitch gyro look in first person, start location is now not reset on sensor reset 2013-05-23 09:30:36 -07:00
Philip Rosedale
6b3f35ef19 Merge pull request #393 from ey6es/master 
Put all environment data in the same packet and only send it off about once a second.
 2013-05-22 21:11:22 -07:00
Philip Rosedale
1037101f7d Merge branch 'master' of https://github.com/worklist/hifi 2013-05-22 19:47:48 -07:00
birarda
380b26b6b6 Merge pull request #402 from birarda/master 
head mouse fix
 2013-05-22 19:46:52 -07:00
Stephen Birarda
120c835004 fix head mouse 2013-05-22 19:46:33 -07:00
Philip Rosedale
5b3ac504c4 Updated merge conflicts 2013-05-22 19:43:11 -07:00
Philip Rosedale
f39fade4c7 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-22 19:40:13 -07:00
Philip Rosedale
22b534cd8e Fixed headmouse 2013-05-22 19:39:37 -07:00
birarda
b6e0207264 Merge pull request #400 from birarda/master 
correct signs for yaw and roll from invensense
 2013-05-22 19:38:59 -07:00
Stephen Birarda
d7a1cc6ea8 correct the sign for yaw and roll for invensense serial data 2013-05-22 19:38:17 -07:00
birarda
8b95db2bd4 Merge pull request #399 from birarda/master 
complete fix for oculus rendering
 2013-05-22 19:16:49 -07:00
Stephen Birarda
3e192cda9b correct rendering for first-person for oculus 2013-05-22 19:15:52 -07:00
birarda
3e16e6a36c Merge pull request #398 from birarda/master 
correct sign of yaw for oculus
 2013-05-22 18:57:06 -07:00
Stephen Birarda
997a10c981 correct the sign of yaw for oculus 2013-05-22 18:56:38 -07:00
Andrzej Kapolka
bb412818aa Merge branch 'master' of https://github.com/worklist/hifi 2013-05-22 18:36:47 -07:00
Jeffrey Ventrella
7da3b8af4e Merge pull request #397 from Ventrella/master 
another fix
 2013-05-22 18:34:03 -07:00
Jeffrey Ventrella
83c12ae9af etc 2013-05-22 18:31:22 -07:00
birarda
a8ef537fe0 Merge pull request #396 from Ventrella/master 
working on pitch yaw roll in avatar head
 2013-05-22 18:21:13 -07:00
Jeffrey Ventrella
82af516471 ya ya 2013-05-22 18:16:11 -07:00
Jeffrey Ventrella
b7613497eb fixed pitch yaw (not roll) 2013-05-22 18:14:18 -07:00
Andrzej Kapolka
1c8418aca3 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-22 18:07:05 -07:00
Philip Rosedale
818201a27c Merge pull request #395 from Ventrella/master 
added first person transition
 2013-05-22 17:43:32 -07:00
Andrzej Kapolka
5f7db8caa6 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-22 17:41:47 -07:00
Jeffrey Ventrella
2f943b697a cleanup 2013-05-22 17:27:48 -07:00
Jeffrey Ventrella
549d3a3671 Merge remote-tracking branch 'upstream/master' 2013-05-22 17:25:06 -07:00
birarda
5a699306d2 Merge pull request #394 from birarda/master 
remove a setter in AudioInjector
 2013-05-22 17:24:50 -07:00
Jeffrey Ventrella
8b49cfbf93 added back transitions to first person 2013-05-22 17:24:46 -07:00
Stephen Birarda
21cdf4ada5 remove setter for isInjectingAudio - shouldn't be set externally 2013-05-22 17:23:46 -07:00
Andrzej Kapolka
a68c8c6389 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-22 17:11:03 -07:00
Andrzej Kapolka
629c7b0146 Send all environment data in the same packet and only send it about once a 
second.
 2013-05-22 17:09:35 -07:00
ZappoMan
da39f28211 Merge pull request #392 from birarda/oculus 
fix broken head rotation set based on copy return
 2013-05-22 16:51:13 -07:00
Stephen Birarda
9657265c24 remove a debug line from setHeadFromGyros 2013-05-22 16:50:17 -07:00
Stephen Birarda
a1b556d6a2 space out if 2013-05-22 16:49:26 -07:00
Stephen Birarda
4738fc888b return Avatar Head by reference so setters actually do something 2013-05-22 16:43:41 -07:00
Andrzej Kapolka
832d7f890a Merge pull request #391 from ey6es/master 
Disable the righting for now, as well as the flat "floor" (to prevent sliding).
 2013-05-22 16:30:57 -07:00
Andrzej Kapolka
b6e78064d8 Disable the righting for now, as well as the "floor" (whose presence makes us 
slide, since the gravity vector isn't pointing straight down).
 2013-05-22 16:29:13 -07:00
Andrzej Kapolka
e48aebdd9e Merge pull request #390 from ey6es/master 
Fix for OS X structure initialization.
 2013-05-22 16:13:55 -07:00
Andrzej Kapolka
96fdc015c5 Fix for OS X; the structure wasn't being zero-initialized as I expected. 2013-05-22 16:12:14 -07:00