Andrzej Kapolka
|
70b25fd6c4
|
Sphere/box collisions for voxels, various utility functions.
|
2013-05-25 19:59:07 -07:00 |
|
Philip Rosedale
|
9baf087c9a
|
Avatar renders right arm in 1P mode
|
2013-05-24 14:29:26 -07:00 |
|
Stephen Birarda
|
81307939d4
|
Merge remote-tracking branch 'upstream/master' into owner-pointers
|
2013-05-24 12:23:12 -07:00 |
|
Stephen Birarda
|
59a6016f4b
|
use a NULL default for owningAvatar to simplify constructors
|
2013-05-24 12:18:38 -07:00 |
|
Stephen Birarda
|
49b483ef53
|
maintain a pointer to owning avatar from HeadData
|
2013-05-24 12:17:48 -07:00 |
|
Stephen Birarda
|
36892da488
|
keep a pointer to owning agent in AgentData
|
2013-05-24 12:17:34 -07:00 |
|
Philip Rosedale
|
59ac5ebd66
|
Head will always render when body does - no decapitation
|
2013-05-24 11:07:19 -07:00 |
|
Philip Rosedale
|
f961a40d1c
|
Chat message height doubled to clear mohawk
|
2013-05-24 10:55:26 -07:00 |
|
Philip Rosedale
|
37cb914891
|
You can reset start location with 'G'
|
2013-05-23 15:02:32 -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 |
|
Philip Rosedale
|
7a0ea8bd59
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-05-23 11:48:18 -07:00 |
|
Philip Rosedale
|
be1fae5958
|
Move head back to center when moving
|
2013-05-23 11:37:27 -07:00 |
|
Philip Rosedale
|
86e3e25663
|
removed commented line, formatting
|
2013-05-23 11:26:14 -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
|
5b3ac504c4
|
Updated merge conflicts
|
2013-05-22 19:43:11 -07:00 |
|
Stephen Birarda
|
d7a1cc6ea8
|
correct the sign for yaw and roll for invensense serial data
|
2013-05-22 19:38:17 -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
|
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 |
|
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
|
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 |
|
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
|
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
|
4d95d0a426
|
more cleanup on lookat
|
2013-05-22 13:24:19 -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 |
|
Andrzej Kapolka
|
88bc6caf51
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-05-22 12:49:35 -07:00 |
|
Andrzej Kapolka
|
30958e3ce6
|
Working on reorientation.
|
2013-05-22 12:49:25 -07:00 |
|
Philip Rosedale
|
b95560587a
|
pitch force 4x bigger in transmitter
|
2013-05-22 12:42:28 -07:00 |
|
Philip Rosedale
|
53dc81e309
|
Fixes per code review.
|
2013-05-22 11:57:11 -07:00 |
|
Jeffrey Ventrella
|
493aff3133
|
more prototyping of head feature geometry
|
2013-05-22 11:42:35 -07:00 |
|
Andrzej Kapolka
|
0e7c0e08eb
|
Since we're not using deltaTime (yet), don't pass it as a parameter (yet).
|
2013-05-22 11:29:46 -07:00 |
|
Andrzej Kapolka
|
ada32f1a8b
|
Added back "floor," "bounce."
|
2013-05-22 11:08:04 -07:00 |
|
Andrzej Kapolka
|
7e5418f8db
|
Fix for default environment, better capsule placement.
|
2013-05-22 10:53:58 -07:00 |
|
Philip Rosedale
|
0d231b5550
|
Added lift to transmitter with finger, for true god-like flight!
|
2013-05-21 23:24:58 -07:00 |
|
Philip Rosedale
|
2edd085941
|
Added sensor fusion with gravity to transmitter to stabilize drift offset in pitch and roll.
|
2013-05-21 22:40:13 -07:00 |
|
Andrzej Kapolka
|
a864a6f8c6
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-05-21 21:34:09 -07:00 |
|