Geenz
|
ed904b58eb
|
Fixed spacing issues per the coding standard.
|
2013-05-30 19:50:01 -04:00 |
|
Geenz
|
fefa74135c
|
Moved to function overloads instead of unique function names.
|
2013-05-30 19:47:25 -04:00 |
|
Geenz
|
0a3dbcd675
|
Removed unused readYaw variable.
|
2013-05-30 17:00:32 -04:00 |
|
Geenz
|
0dda2b88b5
|
Merge branch 'master' of https://github.com/worklist/hifi into 19308
Conflicts:
interface/src/Avatar.cpp - resolved; added avatarRotation setting that's interpreted as a vec3
|
2013-05-30 16:58:48 -04:00 |
|
Andrzej Kapolka
|
27f4674c10
|
Merge pull request #468 from ey6es/master
Fixes for reorientation: load/save pitch/roll, don't update orientation for remote avatars.
|
2013-05-30 12:38:04 -07:00 |
|
Andrzej Kapolka
|
28531fcae0
|
Added --local option to avatar-mixer for testing. Only update velocity,
acceleration, angular velocity, etc., for local avatar.
|
2013-05-30 12:33:05 -07:00 |
|
Andrzej Kapolka
|
342e19aa41
|
Save/restore the pitch and roll as well as the yaw.
|
2013-05-30 12:12:30 -07:00 |
|
Philip Rosedale
|
6712c40073
|
Merge pull request #466 from ey6es/reorient
Avatar orientation conversion: use quaternions rather than Orientation class, generalize rotations so that avatars can be reoriented based on gravity.
|
2013-05-30 11:55:19 -07:00 |
|
Geenz
|
78c3891c92
|
Merge commit '6d57324d0b9fce9d6a030123689bb499ed54c8ad' into 19308
|
2013-05-30 14:48:40 -04:00 |
|
Andrzej Kapolka
|
100d10dc9e
|
Offset camera fix, cleaner frustum transformation.
|
2013-05-30 11:08:33 -07:00 |
|
Andrzej Kapolka
|
3330b20232
|
More reformatting.
|
2013-05-30 10:33:45 -07:00 |
|
Andrzej Kapolka
|
fff9d1c372
|
Formatting.
|
2013-05-30 10:23:19 -07:00 |
|
Andrzej Kapolka
|
b502321b57
|
Moved gravity influence multiplier into constant, reduced.
|
2013-05-30 10:00:52 -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 |
|
birarda
|
6d57324d0b
|
Merge pull request #465 from birarda/master
stop continous killing of audio injectors
|
2013-05-29 18:37:43 -07:00 |
|
Stephen Birarda
|
1f4e9f3051
|
update last heard from time for audio injectors
|
2013-05-29 18:37:03 -07:00 |
|
birarda
|
b4e4e80321
|
Merge pull request #463 from birarda/master
distance attenuation tuning
|
2013-05-29 17:47:23 -07:00 |
|
Stephen Birarda
|
8ba23bc027
|
tune distance attenuation
|
2013-05-29 17:46:54 -07:00 |
|
birarda
|
cad55ffb60
|
Merge pull request #462 from birarda/master
distance attenutation tuning for audio-mixer
|
2013-05-29 17:38:43 -07:00 |
|
Stephen Birarda
|
a3942a072f
|
more tuning on distance attenuation for audio mixer
|
2013-05-29 17:38:00 -07:00 |
|
birarda
|
14bc87b08c
|
Merge pull request #461 from birarda/master
distance attenutation tuning on audio mixer
|
2013-05-29 17:32:49 -07:00 |
|
Stephen Birarda
|
1b2b0afe3a
|
tune the distance attenuation on audio-mixer
|
2013-05-29 17:32:32 -07:00 |
|
birarda
|
f20dd82240
|
Merge pull request #460 from ZappoMan/disco
new floor
|
2013-05-29 17:07:29 -07:00 |
|
ZappoMan
|
49f4df3a5e
|
coding standard cleanup
|
2013-05-29 17:07:12 -07:00 |
|
ZappoMan
|
871cddfcc1
|
coding standard cleanup
|
2013-05-29 17:05:22 -07:00 |
|
ZappoMan
|
ffffa71d1a
|
new floor
|
2013-05-29 16:58:17 -07:00 |
|
birarda
|
8cfbff4bb7
|
Merge pull request #459 from birarda/master
fix a crash in the avatar-mixer
|
2013-05-29 16:57:41 -07:00 |
|
Stephen Birarda
|
bb3feb13eb
|
correct the currentBufferPosition for injector packets as well
|
2013-05-29 16:57:13 -07:00 |
|
Geenz
|
f0d7b47c37
|
Merge branch 'master' of https://github.com/worklist/hifi into 19308
|
2013-05-29 19:47:54 -04:00 |
|
birarda
|
73168af4d1
|
Merge pull request #458 from birarda/master
move the mouth out farther in front of the face
|
2013-05-29 16:38:35 -07:00 |
|
Stephen Birarda
|
089dc3669d
|
push the mouth out in front of the face
|
2013-05-29 16:37:40 -07:00 |
|
birarda
|
64d02f5f5f
|
Merge pull request #457 from birarda/master
make it harder to quit accidentally
|
2013-05-29 16:06:40 -07:00 |
|
ZappoMan
|
3a80e09165
|
Merge pull request #456 from birarda/master
allow the injector to fire based on a trigger distance
|
2013-05-29 16:05:30 -07:00 |
|
Stephen Birarda
|
b0a8de818d
|
make quit CMD-Q instead of just Q
|
2013-05-29 16:05:03 -07:00 |
|
Stephen Birarda
|
c0a9914efd
|
add trigger based firing to audio injector
|
2013-05-29 16:03:32 -07:00 |
|
birarda
|
6060e5e42e
|
Merge pull request #455 from ZappoMan/disco
dance floor
|
2013-05-29 15:52:36 -07:00 |
|
ZappoMan
|
1fcf787991
|
dance floor
|
2013-05-29 15:42:29 -07:00 |
|
birarda
|
c8bc2f0f14
|
Merge pull request #454 from birarda/camera-fix
one line fix for camera transition
|
2013-05-29 15:32:30 -07:00 |
|
Stephen Birarda
|
02333644dc
|
one line fix in AvatarTouch
|
2013-05-29 15:31:18 -07:00 |
|
Stephen Birarda
|
7611972bca
|
link the avatars library to the injector target
|
2013-05-29 15:06:10 -07:00 |
|
Stephen Birarda
|
c259b025db
|
fix a crash in audio injector when there is no audio mixer
|
2013-05-29 15:05:39 -07:00 |
|
Stephen Birarda
|
19e29585fc
|
remove some spacing at the bottom of eve main
|
2013-05-29 15:04:22 -07:00 |
|
Stephen Birarda
|
eb5375869d
|
also return the list of avatars to audio injectors
|
2013-05-29 14:34:58 -07:00 |
|
Geenz
|
c33d2ee25e
|
Coding standard cleanup based upon ZappoMan's suggestions.
|
2013-05-29 16:46:47 -04:00 |
|
birarda
|
23e24287d3
|
Merge pull request #452 from ZappoMan/master
Temporary hack fix to voxels not discarding
|
2013-05-29 12:16:06 -07:00 |
|
ZappoMan
|
c70ade0cc1
|
temporary hack fix to not discarding voxels
|
2013-05-29 12:14:45 -07:00 |
|
Philip Rosedale
|
eb4c2358a5
|
Merge pull request #451 from Ventrella/master
increased hand motion sensitivity
|
2013-05-29 11:52:39 -07:00 |
|
Jeffrey Ventrella
|
ab1c00dac6
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-29 11:51:34 -07:00 |
|