ZappoMan
8448e47df8
cleanup dead code
2013-10-17 12:27:23 -07:00
ZappoMan
515dc657fb
cleanup dead code
2013-10-17 12:26:01 -07:00
ZappoMan
fbf1a75d07
cleanup dead code
2013-10-17 12:24:53 -07:00
ZappoMan
095b716366
make population stats use public getters and private member variables
2013-10-17 12:16:03 -07:00
Stephen Birarda
628a3ba489
fixes to AvatarMixer for new UUID setup
2013-10-17 12:10:27 -07:00
Stephen Birarda
1c70e09178
repairs to audio exchange for new UUID setup
2013-10-17 11:58:52 -07:00
ZappoMan
c5deed36b0
added ifdefs for HAS_AUDIT_CHILDREN and added more memory tracking stats
2013-10-17 11:56:18 -07:00
Stephen Birarda
a5c837b197
fix domain-server check in from assigned clients
2013-10-17 11:51:42 -07:00
Stephen Birarda
fa146e302d
remove 16-bit node IDs and replace with UUIDs
2013-10-17 11:49:41 -07:00
Andrzej Kapolka
e63923774f
Merge pull request #1073 from ey6es/master
...
These should actually start at two pi (that's the maximum distance).
2013-10-17 11:07:48 -07:00
PhilipRosedale
f6efccea06
Merge branch 'master' of https://github.com/worklist/hifi
2013-10-17 11:07:45 -07:00
Andrzej Kapolka
36d4be4e3b
These should actually start at two pi (that's the maximum distance).
2013-10-17 11:05:52 -07:00
PhilipRosedale
9643c1262c
Fix mute button, visualize gaze direction when showing headMouse
2013-10-17 11:03:12 -07:00
Andrzej Kapolka
537f325447
Merge pull request #1072 from ey6es/master
...
Another slight fix for circling.
2013-10-17 11:01:40 -07:00
Andrzej Kapolka
e9a3eb2edd
Merge branch 'master' of https://github.com/worklist/hifi
2013-10-17 11:00:59 -07:00
Andrzej Kapolka
b25020b84a
Need to halve the target angle, because both participants will be moving.
...
Use randomness to resolve cases where two participants are on top of one
another.
2013-10-17 10:58:33 -07:00
ZappoMan
296f18a844
make offset bounds match 20 bit storage
2013-10-17 09:58:28 -07:00
Stephen Birarda
6805b0e2c6
Merge branch 'master' of github.com:worklist/hifi into assignment
2013-10-17 09:23:25 -07:00
ZappoMan
e8ce60d275
implement support for three children encoding
2013-10-16 21:42:55 -07:00
ZappoMan
d2bab77c88
implement support for three children encoding
2013-10-16 21:42:47 -07:00
Stephen Birarda
012fccc72e
send ping to AvM and VS for socket activation
2013-10-16 18:01:15 -07:00
Andrzej Kapolka
9e68c5dfba
Merge pull request #1071 from ey6es/master
...
Fixed glow flickering, tweak circling again.
2013-10-16 17:53:30 -07:00
Stephen Birarda
7de88898e1
activate appropriate socket after receiving ping reply
2013-10-16 17:51:32 -07:00
Andrzej Kapolka
121a7f8270
Widen the circle influence, increase the approach rate.
2013-10-16 17:48:28 -07:00
Andrzej Kapolka
a5a81a585e
Fix for glow flickering.
2013-10-16 17:47:39 -07:00
Stephen Birarda
a4be44c2c5
remove the injector target
2013-10-16 17:28:42 -07:00
Stephen Birarda
849e5817ec
remove a couple of spaces
2013-10-16 17:27:16 -07:00
Andrzej Kapolka
8472775674
Merge pull request #1070 from ey6es/master
...
Decrease the distance between members, increase the influence of the cir...
2013-10-16 17:22:17 -07:00
Andrzej Kapolka
89d6c7905b
Decrease the distance between members, increase the influence of the circle,
...
don't rotate members.
2013-10-16 17:21:09 -07:00
Stephen Birarda
330e78920a
use Qt to query interfaces for correct local address
2013-10-16 17:06:39 -07:00
Stephen Birarda
e40ab5d13f
add debug of Node's local address
2013-10-16 16:52:05 -07:00
Philip Rosedale
d7b98dbc05
Merge pull request #1069 from PhilipRosedale/master
...
Move to 'european' comfort distance for chat circle
2013-10-16 16:50:35 -07:00
Philip Rosedale
c324933b8a
Move to 'european' comfort distance for chat circle
2013-10-16 16:49:33 -07:00
Stephen Birarda
747175311f
handle stun response in assigned clients
2013-10-16 16:37:24 -07:00
Philip Rosedale
f9992dd704
Merge pull request #1068 from ey6es/encircle
...
First stab at chat circling behavior.
2013-10-16 16:30:16 -07:00
Stephen Birarda
224b0d9671
domain server accepts custom public address from node
2013-10-16 16:27:13 -07:00
Stephen Birarda
f581d4d976
handle STUN request and response in NodeList
2013-10-16 16:01:23 -07:00
Andrzej Kapolka
7a1f845189
Another rate adjustment.
2013-10-16 15:48:25 -07:00
Andrzej Kapolka
6df245908c
Reduce the approach rate.
2013-10-16 15:41:38 -07:00
Andrzej Kapolka
50216ca4ad
Base the number of people we include in the circle on whether we would
...
actually fall in its radius (plus an expansion factor).
2013-10-16 15:37:59 -07:00
Andrzej Kapolka
11fea386b6
First stab at chat circling mechanism.
2013-10-16 14:07:36 -07:00
ZappoMan
1e5ce8a7e5
first cut at really getting _children UNION to work
2013-10-16 12:54:37 -07:00
Philip Rosedale
20a2191875
Merge pull request #1067 from birarda/master
...
clear agent audio injector after send, don't send if empty
2013-10-16 11:58:46 -07:00
Stephen Birarda
ef655f5e78
clear agent audio injector after send, don't send if empty
2013-10-16 11:50:19 -07:00
Andrzej Kapolka
d3c3e330e0
Merge pull request #1066 from ey6es/master
...
Have textures default to white when they fail to load.
2013-10-16 11:01:56 -07:00
Andrzej Kapolka
c9344d4382
Have textures default to white when they fail to load.
2013-10-16 11:00:41 -07:00
Stephen Birarda
620fcae8af
Merge branch 'master' of github.com:worklist/hifi into assignment
2013-10-16 10:26:59 -07:00
Philip Rosedale
67e035ee95
Merge pull request #1065 from machinelevel/dev4
...
Add left-arm movement to remote avatars without changing network packet structure
2013-10-16 09:29:01 -07:00
Philip Rosedale
a40156746e
Merge pull request #1064 from ey6es/skinny
...
Skin the Faceshift models so that they bend at the neck rather than rotating around. Also, fix various material parameters and apply per-pixel lighting.
2013-10-16 09:22:11 -07:00
Eric Johnston
36f06720d0
Add left-arm movement to remote avatars without changing network packet structure.
...
Move MyAvatar leap hand arm-movement into Avatar::updateLeapHandPositions(), to enable remote avatars to position fingertips and IK-arms based on Leap hand data.
2013-10-16 08:21:35 -07:00
