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
ZappoMan
afcf6dd3e0
type squish
2013-10-15 18:28:56 -07:00
Andrzej Kapolka
a79c0a9244
Removed unused shader.
2013-10-15 17:14:20 -07:00
Andrzej Kapolka
e2592fd9e7
Merge branch 'master' of https://github.com/worklist/hifi into skinny
2013-10-15 17:08:24 -07:00
Andrzej Kapolka
564c824143
Merge pull request #1063 from birarda/assignment
...
DS assignment JSON touchups
2013-10-15 17:04:32 -07:00
Andrzej Kapolka
6a265eacf2
Keep normal and dilatable textures in separate maps to fix crash on manly
...
"man" model.
2013-10-15 16:40:35 -07:00
Andrzej Kapolka
8631cc3264
Try to apply the blendshape scale.
2013-10-15 16:29:28 -07:00
Andrzej Kapolka
b04ed72b83
I forgot that the children are in reverse order.
2013-10-15 16:17:56 -07:00
Andrzej Kapolka
84803854bf
Merge branch 'master' of https://github.com/worklist/hifi into skinny
2013-10-15 15:59:17 -07:00
Andrzej Kapolka
ba25087b3e
Support for multiple mesh "parts" (with different materials), fix for
...
untextured meshes.
2013-10-15 15:58:34 -07:00
Stephen Birarda
5523d52faf
Merge branch 'master' of github.com:worklist/hifi into assignment
2013-10-15 15:45:37 -07:00
Stephen Birarda
1ed2b3d8fe
add both fulfilled and queued assignments to DS json
2013-10-15 15:38:43 -07:00
Stephen Birarda
4cb657fa24
remove dependency on cJSON and use Qt instead
2013-10-15 15:29:51 -07:00
ZappoMan
6fff53a2dc
next round of voxelnode size improvements
2013-10-15 14:43:51 -07:00
Leonardo Murillo
97e0aeb707
Merge pull request #1062 from birarda/assignment
...
add a JSON endpoint for current assignments to DS
2013-10-15 14:43:30 -07:00
Stephen Birarda
2ec42a2a5d
revise linkage of civetweb for both DS and VS
2013-10-15 14:24:54 -07:00
Andrzej Kapolka
0a5ba79bbe
Merge branch 'master' of https://github.com/worklist/hifi into skinny
2013-10-15 14:01:53 -07:00
Stephen Birarda
41e1ec180c
add a JSON endpoint for current assignments
2013-10-15 13:45:40 -07:00
Andrzej Kapolka
66250ed488
Eye tweak.
2013-10-15 13:43:27 -07:00
ZappoMan
9800dc0fde
removed dead code
2013-10-15 13:40:55 -07:00
ZappoMan
05c9d4febc
added old style voxelnode for size comparison
2013-10-15 13:37:14 -07:00
ZappoMan
9d0ff1595a
make voxelnode population statistics static members instead of per node
2013-10-15 13:33:38 -07:00
Andrzej Kapolka
ce0d13feb4
Working on the neck transform.
2013-10-15 12:59:52 -07:00
ZappoMan
86ba5e3064
some size comparison debugging
2013-10-15 12:11:49 -07:00
ZappoMan
9ba39c3a84
removed center from AABox to further save memory
2013-10-15 12:05:54 -07:00
Andrzej Kapolka
053c116481
Removed unused variable.
2013-10-15 11:57:42 -07:00
Andrzej Kapolka
d06acdd169
Per-pixel shading, material tweaks.
2013-10-15 11:50:29 -07:00
ZappoMan
c9b0edf345
first cut at reducing memory footprint of AABox
2013-10-15 11:29:04 -07:00
Stephen Birarda
2e84d1e213
Merge pull request #1061 from PhilipRosedale/option_to_hide_all_overlay
...
Option to hide all overlay
2013-10-15 11:11:58 -07:00
Philip Rosedale
746bce8626
All onscreen text, overlay OFF when stats are off
2013-10-15 11:01:22 -07:00
