Commit graph

3672 commits

Author SHA1 Message Date
Andrzej Kapolka
c8b2ed0213 More progress on reading skeletons. 2013-10-17 17:30:34 -07:00
Andrzej Kapolka
9ba3c3719f Working on skeleton loading, added support for FBX text format (exported by
Blender).
2013-10-17 15:45:57 -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
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
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
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
c324933b8a Move to 'european' comfort distance for chat circle 2013-10-16 16:49:33 -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
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
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
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
ba25087b3e Support for multiple mesh "parts" (with different materials), fix for
untextured meshes.
2013-10-15 15:58:34 -07:00
Andrzej Kapolka
0a5ba79bbe Merge branch 'master' of https://github.com/worklist/hifi into skinny 2013-10-15 14:01:53 -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
Philip Rosedale
746bce8626 All onscreen text, overlay OFF when stats are off 2013-10-15 11:01:22 -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
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
Eric Johnston
d5885acd75 Cleanup and simplification per feedback 2013-10-14 10:09:08 -07:00
Eric Johnston
7bc2cf6fa9 Leap interface and Avatar: left-hand IK works for Leap interface.
This is in and smooth, and there's a decision to be made:
In the case where only one hand is visible, we have to decide if it's the left or right hand. Currently it's simple, based on which side it's detected on.
So far this seems to work best, in the (very) common case where hands go in/out of the sensor's field frequently.
We could also use a history-based heuristic to hold one hand as left/right, but that means that when it guesses wrong the error lingers.
Detecting handedness based on where the thumbs are would be better, but is unreliable on the Leap.
I went for the simple/clear version, but we can do whatever we want.
2013-10-14 09:01:50 -07:00
Andrzej Kapolka
adc5d4d256 Merge branch 'master' of https://github.com/worklist/hifi into skinny 2013-10-11 17:55:38 -07:00
Andrzej Kapolka
cec0ee0b22 Working on processing the cluster/skin information. 2013-10-11 17:51:29 -07:00
Stephen Birarda
dc4548a91b Merge pull request #1054 from PhilipRosedale/i-can-always-move
better movement near others
2013-10-11 17:49:52 -07:00
Philip Rosedale
b071776c22 Merge pull request #1051 from ZappoMan/keep_local_voxels
Clean up some crashes in client side handling of voxels
2013-10-11 17:15:41 -07:00
Philip Rosedale
3cd4415e6d Merge pull request #1052 from ZappoMan/hide_cursor
implement hide cursor on no mouse movement
2013-10-11 17:14:29 -07:00
Philip Rosedale
6281a28f69 better movement near others 2013-10-11 17:00:25 -07:00
Stephen Birarda
6369e9959f change goToUser shortcut to @ 2013-10-11 15:25:17 -07:00
ZappoMan
e91127bc5c implement hide cursor on no mouse movement 2013-10-11 14:56:37 -07:00
stojce
355a1f3da3 Merge branch 'master' of https://github.com/worklist/hifi into 19435
Conflicts:
	interface/src/avatar/Head.cpp
	interface/src/avatar/Head.h
2013-10-11 22:54:59 +02:00
ZappoMan
f2ef80b704 Merge pull request #1049 from stojce/19426
Code Review for Job #19426
2013-10-11 12:54:13 -07:00
ZappoMan
c6df36a40b Merge pull request #1047 from stojce/19434
Code Review for Job #19434
2013-10-11 12:52:13 -07:00
ZappoMan
dfe23c9342 merge cleanup 2013-10-11 12:49:50 -07:00
ZappoMan
4da19531ca Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels 2013-10-11 10:49:57 -07:00
Stephen Birarda
eebd38189b add killing of local voxels to domain change 2013-10-11 10:07:42 -07:00