birarda
|
05ad7309a1
|
Merge pull request #411 from ey6es/master
Fix for starfield rendering on Oculus.
|
2013-05-24 10:14:31 -07:00 |
|
Philip Rosedale
|
bf94c88bcc
|
Fixes per review
|
2013-05-24 10:12:50 -07:00 |
|
Philip Rosedale
|
95e73afc78
|
Added the avatar mohawk
|
2013-05-24 00:16:52 -07:00 |
|
Andrzej Kapolka
|
add84b2f39
|
Hide the cursor when in fullscreen Oculus mode.
|
2013-05-23 17:58:04 -07:00 |
|
Andrzej Kapolka
|
9be4f06e9a
|
Disable voxel textures by default.
|
2013-05-23 17:32:43 -07:00 |
|
Andrzej Kapolka
|
514c12c7fc
|
Merge branch 'master' of https://github.com/worklist/hifi
Conflicts:
interface/src/Application.cpp
|
2013-05-23 15:39:04 -07:00 |
|
Andrzej Kapolka
|
9b433c974c
|
Fix for starfield rendering on Oculus: put inter-pupil translation in
modelview matrix where it belongs, don't reset perspective projection for
starfield.
|
2013-05-23 15:35:41 -07:00 |
|
Stephen Birarda
|
b673715aa2
|
remove the no longer in use AvatarRenderer
|
2013-05-23 15:18:32 -07:00 |
|
Philip Rosedale
|
37cb914891
|
You can reset start location with 'G'
|
2013-05-23 15:02:32 -07:00 |
|
Philip Rosedale
|
235cfc8ab2
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-05-23 12:33:39 -07:00 |
|
Philip Rosedale
|
32d2418b7a
|
Added display head mouse option (default off) and all camera modes follow head gyros the same way.
|
2013-05-23 12:33:26 -07:00 |
|
ZappoMan
|
089d8d525e
|
Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation
|
2013-05-23 12:20:34 -07:00 |
|
ZappoMan
|
6ec61996c9
|
Merge pull request #405 from PhilipRosedale/master
Chat in right place above head, not body, tweaks to sensors, reset behavior, gyro pitch back.
|
2013-05-23 12:19:43 -07:00 |
|
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 |
|
ZappoMan
|
473665fb4a
|
Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation
|
2013-05-23 12:16:29 -07:00 |
|
ZappoMan
|
6e5ed6435b
|
added shortcut key to log menu
|
2013-05-23 12:06:59 -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
|
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 |
|
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 |
|
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 |
|
Stephen Birarda
|
d7a1cc6ea8
|
correct the sign for yaw and roll for invensense serial data
|
2013-05-22 19:38:17 -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 |
|
Jeffrey Ventrella
|
83c12ae9af
|
etc
|
2013-05-22 18:31:22 -07:00 |
|
Jeffrey Ventrella
|
b7613497eb
|
fixed pitch yaw (not roll)
|
2013-05-22 18:14:18 -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 |
|
Jeffrey Ventrella
|
8b49cfbf93
|
added back transitions to first person
|
2013-05-22 17:24: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
|
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
|
96fdc015c5
|
Fix for OS X; the structure wasn't being zero-initialized as I expected.
|
2013-05-22 16:12:14 -07:00 |
|
Jeffrey Ventrella
|
4940a6ae9a
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-22 15:51:03 -07:00 |
|
Jeffrey Ventrella
|
0b014c5635
|
cleaned up some stuff
|
2013-05-22 15:50:36 -07:00 |
|