Philip Rosedale
|
5df09b2932
|
remove debugging printf
|
2013-07-03 23:20:55 -07:00 |
|
Philip Rosedale
|
0f312d4c9b
|
Tuned smooth gyro look values to feel better.
|
2013-07-03 23:17:43 -07:00 |
|
Philip Rosedale
|
92cec4cfa0
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-07-03 22:55:09 -07:00 |
|
Philip Rosedale
|
2de6d3eb6a
|
Make 'Go Home' an option from the options because it conflicts with 'G' for gravity on/off
|
2013-07-03 22:55:01 -07:00 |
|
Andrzej Kapolka
|
43258f9dcd
|
Use 15 blinks per minute as a base/maximum frequency.
|
2013-07-03 17:12:43 -07:00 |
|
Stephen Birarda
|
0be42698b5
|
resolve conflicts on merge with upstream master
|
2013-07-03 15:12:50 -07:00 |
|
Philip Rosedale
|
1868717520
|
Improve gyro look to smoothly follow the head and not move for small movements
|
2013-07-03 11:10:40 -07:00 |
|
Stephen Birarda
|
36c6912de8
|
your agents are now nodes
|
2013-07-03 10:35:09 -07:00 |
|
Andrzej Kapolka
|
4ecb4ab3c6
|
Restore the amplification; blink faster.
|
2013-07-02 17:14:54 -07:00 |
|
Andrzej Kapolka
|
f2f29d2e60
|
Well, I guess OS X doesn't like || and && without parentheses.
|
2013-06-25 16:58:31 -07:00 |
|
Andrzej Kapolka
|
6eb421d564
|
Blink less when talking (and never when brows are raised); force a blink after
we stop talking.
|
2013-06-25 16:51:22 -07:00 |
|
Andrzej Kapolka
|
a0ecd167fc
|
Replace 0/1 with FULLY_OPEN/CLOSED.
|
2013-06-24 10:31:11 -07:00 |
|
Andrzej Kapolka
|
1e258aae99
|
Define blink speed as a constant.
|
2013-06-24 10:20:01 -07:00 |
|
Andrzej Kapolka
|
ef7c6ebdc6
|
Basic blinking.
|
2013-06-21 18:11:31 -07:00 |
|
Andrzej Kapolka
|
c11ab45474
|
It seems gl_ModelViewMatrixInverse is problematic on OS X; let's try passing
in the camera's position as transformed into model space.
|
2013-06-14 17:21:35 -07:00 |
|
Andrzej Kapolka
|
790cdfb0bd
|
Added refraction to irises.
|
2013-06-14 16:46:34 -07:00 |
|
Andrzej Kapolka
|
ec0b1a99fb
|
Fix iris orientations: start with the head orientation, then rotate onto the
lookat vector. This way, the irises don't rotate around as we yaw.
|
2013-06-14 11:23:08 -07:00 |
|
Philip Rosedale
|
dd1df47c71
|
fixes per review
|
2013-06-13 16:20:28 -07:00 |
|
Philip Rosedale
|
e6e147d86a
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-06-13 16:09:28 -07:00 |
|
Andrzej Kapolka
|
e401663459
|
Added per-pixel specular highlight to irises.
|
2013-06-13 15:58:49 -07:00 |
|
Andrzej Kapolka
|
466c062bc1
|
Use a bound texture for the iris, load it with Qt rather than lodepng (we can
probably just remove the lodepng dependency).
|
2013-06-13 14:41:06 -07:00 |
|
Philip Rosedale
|
8af0da754f
|
we are always looking at something
|
2013-06-13 14:21:14 -07:00 |
|
Philip Rosedale
|
e32f9f387a
|
Basic random eye movements added, and fixation on camera in mirror mode.
|
2013-06-13 13:50:56 -07:00 |
|
Andrzej Kapolka
|
59c8d9d26a
|
Function cleanup, fixed misspelling, tweaked transparency distances to
accomodate lean.
|
2013-06-12 10:25:28 -07:00 |
|
Andrzej Kapolka
|
e0e94481c9
|
Add pitch/yaw scale preference to control degree of view rotation.
|
2013-06-06 17:53:00 -07:00 |
|
Andrzej Kapolka
|
ffc1c33455
|
Removed double negation for coordinates, world aligned orientation -> camera
orientation, removed roll.
|
2013-06-06 17:25:52 -07:00 |
|
Stephen Birarda
|
30d6c7f68a
|
Merge remote-tracking branch 'upstream/master' into synthesis
|
2013-06-05 18:26:12 -07:00 |
|
Philip Rosedale
|
b38c68ab20
|
remove unused setHeadFromGyros() routine - confusing.
|
2013-06-05 10:46:55 -07:00 |
|
Stephen Birarda
|
6c2dcb86c8
|
Merge remote-tracking branch 'upstream/master' into synthesis
|
2013-06-05 09:55:16 -07:00 |
|
ZappoMan
|
4f2af717f2
|
Fixed merge issue with new orientation vectors, migrated to common identity names
|
2013-06-04 17:27:40 -07:00 |
|
ZappoMan
|
edf6e767f0
|
removed unused variable
|
2013-06-04 09:35:38 -07:00 |
|
Stephen Birarda
|
4348702dd2
|
Merge remote-tracking branch 'upstream/master' into synthesis
|
2013-06-03 11:53:13 -07:00 |
|
Stephen Birarda
|
2d7c397138
|
create a FreeVerb object for each other agent per agent
|
2013-05-31 15:47:57 -07:00 |
|
Jeffrey Ventrella
|
fdfc639c23
|
merge
|
2013-05-31 13:52:22 -07:00 |
|
Andrzej Kapolka
|
021dce72be
|
Moved direction vectors to AvatarData, made them align with OpenGL view space
(to avoid the 180 degree rotations).
|
2013-05-30 09:55:34 -07:00 |
|
Andrzej Kapolka
|
9b301eb235
|
Merge branch 'master' of https://github.com/worklist/hifi into reorient
Conflicts:
interface/src/Avatar.cpp
|
2013-05-29 19:13:18 -07:00 |
|
Andrzej Kapolka
|
d6855b6430
|
Massive changes to orientations: use quaternions rather than Orientation
class.
|
2013-05-29 19:05:33 -07:00 |
|
Jeffrey Ventrella
|
88ff0ea7aa
|
merge
|
2013-05-29 16:54:15 -07:00 |
|
Jeffrey Ventrella
|
4c7d75b39e
|
testing avatar touch
|
2013-05-29 16:52:48 -07:00 |
|
Stephen Birarda
|
089dc3669d
|
push the mouth out in front of the face
|
2013-05-29 16:37:40 -07:00 |
|
Jeffrey Ventrella
|
66c7da6552
|
simplify avatar proximity check for 1p transition
|
2013-05-29 15:24:37 -07:00 |
|
Stephen Birarda
|
a5a30efec9
|
CR fixes
|
2013-05-29 11:42:10 -07:00 |
|
Jeffrey Ventrella
|
31ff768363
|
fixed some glitches in avatar render alpha transition between 3p and 1p
|
2013-05-29 08:30:14 -07:00 |
|
Stephen Birarda
|
65f10cb99a
|
fix the enum in AABox, fix a warning in Head
|
2013-05-28 16:26:18 -07:00 |
|
Stephen Birarda
|
e040c927f5
|
Merge remote-tracking branch 'upstream/master' into mouth-render
|
2013-05-28 15:58:11 -07:00 |
|
Stephen Birarda
|
9f2c0adec7
|
move audioLoudness to HeadData
|
2013-05-28 12:22:51 -07:00 |
|
Jeffrey Ventrella
|
4e4a672f32
|
fixed visual glitch where mouth penetrates head sphere
|
2013-05-26 17:17:15 -07:00 |
|
Jeffrey Ventrella
|
9f7e05d407
|
integrated Philip's mohawk colors into my hair code and added a switch to test each version
|
2013-05-26 10:18:35 -07:00 |
|
Jeffrey Ventrella
|
1e4771fe27
|
fix
|
2013-05-24 18:05:14 -07:00 |
|
Jeffrey Ventrella
|
0c2c90b84d
|
cleanup
|
2013-05-24 18:01:25 -07:00 |
|