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

6689 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Andrzej Kapolka
124966d2e4 More progress on skinning. 2013-10-14 18:39:19 -07:00
Andrzej Kapolka
db30e729d4 More work towards skinning. 2013-10-14 16:46:17 -07:00
ZappoMan
924053f2ec added additional debugging of VoxelNode memory usage, shrunk size of VoxelNode by better alignment 2013-10-14 15:10:56 -07:00
ZappoMan
f0fc973db1 move loading of voxel file to the persist thread so that assignment client will load voxel server faster 2013-10-14 12:42:15 -07:00
ZappoMan
1513003ecd added more stats to voxel server status 2013-10-14 12:20:50 -07:00
ZappoMan
3425685119 first cut at added voxel node memory usage debugging to client and server 2013-10-14 12:09:44 -07:00
ZappoMan
8c5c1aeae7 Merge pull request #1058 from ZappoMan/hide_cursor 
make mouse cursor hiding more aware of focused window and bounds
 2013-10-14 11:50:21 -07:00
ZappoMan
6f9fdfba2f make mouse cursor hiding more aware of focused window and bounds 2013-10-14 11:39:48 -07:00
Andrzej Kapolka
ed0acd24f7 Merge branch 'master' of https://github.com/worklist/hifi into skinny 2013-10-14 10:40:30 -07:00
ZappoMan
5663fdd85a Merge pull request #1057 from machinelevel/dev4 
Leap interface and Avatar: left-hand IK works for Leap interface.
 2013-10-14 10:21:43 -07:00
Eric Johnston
d5885acd75 Cleanup and simplification per feedback 2013-10-14 10:09:08 -07:00