Commit graph

1719 commits

Author SHA1 Message Date
Jeffrey Ventrella
ab1c00dac6 Merge remote-tracking branch 'upstream/master' 2013-05-29 11:51:34 -07:00
Jeffrey Ventrella
e34193f1d7 increased hand motion sensitivity 2013-05-29 11:51:16 -07:00
ZappoMan
408fef0de8 Merge pull request #450 from birarda/master
make audio echo a menu option instead of forcing it with the mirror mode
2013-05-29 11:47:38 -07:00
Stephen Birarda
b6a0662c98 inline the shouldEchoAudio 2013-05-29 11:47:02 -07:00
Jeffrey Ventrella
ab3b0c8aa3 alpha 2013-05-29 11:43:42 -07:00
Stephen Birarda
a5a30efec9 CR fixes 2013-05-29 11:42:10 -07:00
Jeffrey Ventrella
350bd878fc fix 2013-05-29 11:39:53 -07:00
Stephen Birarda
5d74a865e8 make audio echo a menu option instead of forcing with mirror 2013-05-29 11:35:32 -07:00
Jeffrey Ventrella
39805db040 Merge remote-tracking branch 'upstream/master' 2013-05-29 11:27:36 -07:00
Jeffrey Ventrella
39499e4a92 fix to head transparency 2013-05-29 11:26:06 -07:00
Philip Rosedale
c31c14c56e Merge remote-tracking branch 'upstream/master' into one-liner 2013-05-29 10:46:55 -07:00
Philip Rosedale
ca8c78162d one line fix for translucent head 2013-05-29 10:46: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
Jeffrey Ventrella
0e329af03e made inline 2013-05-28 18:55:21 -07:00
Jeffrey Ventrella
b98d03337d fixed bug causing camera to not get updated position of other av 2013-05-28 18:49:16 -07:00
Jeffrey Ventrella
e4c0aeb9a0 added AVATAR_FACING_THRESHOLD to avatarTouch 2013-05-28 18:15:29 -07:00
Jeffrey Ventrella
5d9b8c08b3 Merge remote-tracking branch 'upstream/master' 2013-05-28 17:57:42 -07:00
Jeffrey Ventrella
923c39cdc0 fixed third person shift bug 2013-05-28 17:57:11 -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
8118e3bf69 type squish in Audio.cpp 2013-05-28 16:23:54 -07:00
Stephen Birarda
55954899e6 fix silent audio on client 2013-05-28 16:20:23 -07:00
Stephen Birarda
badab39ef1 resolve conflict on merge with upstream master 2013-05-28 15:58:57 -07:00
Stephen Birarda
e040c927f5 Merge remote-tracking branch 'upstream/master' into mouth-render 2013-05-28 15:58:11 -07:00
birarda
17e3902d17 Merge pull request #435 from Ventrella/master
Integrated mohawk code, and did some cleanup and improvements on avatar
2013-05-28 15:50:48 -07:00
Stephen Birarda
9f2c0adec7 move audioLoudness to HeadData 2013-05-28 12:22:51 -07:00
Jeffrey Ventrella
5715860f6b added Skeleton class (to be completed soon) 2013-05-27 18:55:23 -07:00
Jeffrey Ventrella
75b57d17a7 fixed some things based on recent code review 2013-05-27 18:54:44 -07:00
Andrzej Kapolka
278ff00926 Fixed Linux build error and a warning on call to Avatar.simulate, moved grid
size constant to world.h and made gravity bounds match.
2013-05-27 14:46:16 -07:00
Andrzej Kapolka
1df7806464 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-27 14:40:30 -07:00
Andrzej Kapolka
949befee09 Fix for NaN. 2013-05-27 14:37:07 -07:00
Andrzej Kapolka
cfb66bee95 Capsule/box collisions. 2013-05-27 14:05:44 -07:00
Jeffrey Ventrella
096e465d36 cleaned up some formatting and in-line functions in Avatar.cpp 2013-05-27 10:31:31 -07:00
Jeffrey Ventrella
d43c5ca52c normalized body spring tightness 2013-05-26 21:56:21 -07:00
Jeffrey Ventrella
ad5d097ed4 improved neck rendering 2013-05-26 17:44:52 -07:00
Jeffrey Ventrella
4e4a672f32 fixed visual glitch where mouth penetrates head sphere 2013-05-26 17:17:15 -07:00
Jeffrey Ventrella
2b31e79a0b cleanup 2013-05-26 15:23:44 -07:00
Jeffrey Ventrella
883d21a5e4 added facing other av requirement for camera shift to 1p; improved ease-in/out for camera mode shift; did some clean up on the camera code 2013-05-26 15:17:58 -07:00
Jeffrey Ventrella
622863dbf1 Merge remote-tracking branch 'upstream/master' 2013-05-26 10:19:02 -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
Philip Rosedale
7aebbe3047 Merge pull request #434 from ZappoMan/voxel_animation
Improve "Delta Sending" mode..
2013-05-26 09:45:54 -07:00
Andrzej Kapolka
70b25fd6c4 Sphere/box collisions for voxels, various utility functions. 2013-05-25 19:59:07 -07:00
ZappoMan
77e5fbb590 Merge pull request #427 from birarda/oculus
go into oculus mode when connected, fix the yaw pull
2013-05-25 15:38:20 -07:00
ZappoMan
1a2921e3e8 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-05-25 15:32:12 -07:00
ZappoMan
60f2b9a438 removed debug 2013-05-25 15:31:28 -07:00
ZappoMan
f6863081f9 Fix Delta Sending mode by not culling out of view voxels until we STOP moving
- added isViewChanging() which determines if the view is currently changing
- made hasViewChanged() report false UNTIL we've stopped moving
- changed setupNewVoxelsForDrawing() to only call removeOutOfView() if we're not moving
2013-05-25 15:29:23 -07:00
Jeffrey Ventrella
1e4771fe27 fix 2013-05-24 18:05:14 -07:00
Jeffrey Ventrella
8c24477a24 Merge remote-tracking branch 'upstream/master' 2013-05-24 18:01:47 -07:00
Jeffrey Ventrella
0c2c90b84d cleanup 2013-05-24 18:01:25 -07:00
Freddy
6a4bcf32fa Code review fixes 2013-05-24 17:58:31 -07:00
Freddy
30e951578e procedural voxel create/delete noises 2013-05-24 17:27:56 -07:00