Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 08:13:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
6700 commits 71 branches 56 tags 1.2 GiB
Commit graph

6700 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
9bd2499317 Merge pull request #1074 from PhilipRosedale/master 
Fixed audio mute not working, visualize gaze direction when showing head mouse
 2013-10-17 12:36:30 -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
Andrzej Kapolka
9e68c5dfba Merge pull request #1071 from ey6es/master 
Fixed glow flickering, tweak circling again.
 2013-10-16 17:53:30 -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
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
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
Philip Rosedale
f9992dd704 Merge pull request #1068 from ey6es/encircle 
First stab at chat circling behavior.
 2013-10-16 16:30:16 -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
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
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
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
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
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
Andrzej Kapolka
ce0d13feb4 Working on the neck transform. 2013-10-15 12:59:52 -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
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
Philip Rosedale
19f20aa456 Merge branch 'master' of https://github.com/worklist/hifi into i-can-always-move 2013-10-15 10:34:22 -07:00
Philip Rosedale
9f05faa088 Merge pull request #1059 from ZappoMan/voxel_memory_stats 
Voxel memory stats/Load voxels on persist thread/Save memory with VoxelNode size savings
 2013-10-14 20:51:38 -07:00
Andrzej Kapolka
e97cfb8cf8 Per-pixel specular for blend faces. 2013-10-14 19:59:13 -07:00