Philip Rosedale
|
86e3e25663
|
removed commented line, formatting
|
2013-05-23 11:26:14 -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
|
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 |
|
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 |
|
Philip Rosedale
|
56a0471e5f
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-05-22 15:45:21 -07:00 |
|
Philip Rosedale
|
5bee5f07e3
|
Don't render body if looking in mirror, don't render test sphere over and over again for everyone.
|
2013-05-22 15:45:15 -07:00 |
|
Philip Rosedale
|
803c41d636
|
Chat text floats above head, not torso.
|
2013-05-22 15:28:24 -07:00 |
|
Andrzej Kapolka
|
d89939e0bd
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-05-22 15:17:13 -07:00 |
|
ZappoMan
|
f3855e54f9
|
Merge pull request #388 from birarda/master
DRY up the resource copying
|
2013-05-22 15:04:45 -07:00 |
|
Andrzej Kapolka
|
7a8aa7c04f
|
Restore "floor."
|
2013-05-22 14:50:11 -07:00 |
|
Andrzej Kapolka
|
53ae8235f3
|
Fixed threading issue with Environment, more work on avatar righting.
|
2013-05-22 14:43:25 -07:00 |
|
Jeffrey Ventrella
|
7cae808d29
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-22 14:42:25 -07:00 |
|
Jeffrey Ventrella
|
83e2bf2534
|
added menu option for setting display of lookat vectors
|
2013-05-22 14:42:03 -07:00 |
|
Stephen Birarda
|
200d81e0eb
|
DRY up resource subdir copying for OS X bundle
|
2013-05-22 14:40:01 -07:00 |
|
Andrzej Kapolka
|
dd101b393d
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-05-22 14:33:31 -07:00 |
|
Philip Rosedale
|
6b854531aa
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-05-22 14:31:46 -07:00 |
|
birarda
|
9ec04855f8
|
Merge pull request #386 from ZappoMan/voxel_animation
Fix some crashing issues on delete
|
2013-05-22 14:27:29 -07:00 |
|
Philip Rosedale
|
f8c39a8617
|
Merge pull request #382 from ey6es/master
Support for multiple environments, each with their own gravity (and currently, collision spheres).
|
2013-05-22 14:04:28 -07:00 |
|
Jeffrey Ventrella
|
d786fd155f
|
clean up
|
2013-05-22 13:52:29 -07:00 |
|
Philip Rosedale
|
ad8246a0f5
|
Turned log off by default
|
2013-05-22 13:46:39 -07:00 |
|
Jeffrey Ventrella
|
86a2d2316f
|
added method to set look at vector on/off
|
2013-05-22 13:44:38 -07:00 |
|
Andrzej Kapolka
|
bcd8e746f2
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-05-22 13:32:34 -07:00 |
|
Andrzej Kapolka
|
365bb10d6b
|
More work on righting based on gravity vector.
|
2013-05-22 13:30:30 -07:00 |
|
Jeffrey Ventrella
|
c6c0f6d727
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-22 13:24:40 -07:00 |
|
Jeffrey Ventrella
|
4d95d0a426
|
more cleanup on lookat
|
2013-05-22 13:24:19 -07:00 |
|
ZappoMan
|
06f2528d6a
|
fix crashing on deleting voxels in server and client
|
2013-05-22 13:23:01 -07:00 |
|
ZappoMan
|
cbd3497c5c
|
Merge pull request #385 from birarda/master
non-DRY fix for resources copy on OS X
|
2013-05-22 13:18:34 -07:00 |
|
Stephen Birarda
|
62cf452e3d
|
non-DRY fix for correct copy of resources for OS X bundle
|
2013-05-22 13:16:55 -07:00 |
|
Jeffrey Ventrella
|
9de6060d0f
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-22 13:14:09 -07:00 |
|
Jeffrey Ventrella
|
3c3a3fc82e
|
cleaning up look at code - Stephen helped find a transmission bug - fixed.
|
2013-05-22 13:12:11 -07:00 |
|
Philip Rosedale
|
e411b41be7
|
oops moving stdint to header file
|
2013-05-22 13:02:07 -07:00 |
|
Philip Rosedale
|
a03d6f8d80
|
moved pair to own menu
|
2013-05-22 12:55:46 -07:00 |
|