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
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
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
ZappoMan
6fff53a2dc
next round of voxelnode size improvements
2013-10-15 14:43:51 -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
stojce
112ae2bb89
#19437 Adjust bandwith meter to be fixed width, not rescaling
2013-10-11 20:25:58 +02: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
stojce
a87346d39c
Merge branch 'master' of https://github.com/worklist/hifi into 19426
2013-10-11 14:19:31 +02:00
ZappoMan
4be07ececb
fixed a couple crashes and cleaned up some code
2013-10-11 01:30:09 -07:00
Philip Rosedale
bf3f507301
Merge pull request #1043 from birarda/master
...
fix domain jumping with goToUser, remove planet environments
2013-10-10 17:25:43 -07:00
Philip Rosedale
77cf08b8f8
Merge pull request #1044 from birarda/data-server
...
don't goToUser without domain and position
2013-10-10 17:21:58 -07:00
Stephen Birarda
2c181011b3
don't attempt to go to user without domain AND position
2013-10-10 16:48:26 -07:00
ZappoMan
fbcf66b232
Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels
...
Conflicts:
interface/src/Menu.h
2013-10-10 16:37:07 -07:00
Stephen Birarda
6f868a00eb
reset environment on domain-server change
2013-10-10 16:34:35 -07:00
Stephen Birarda
aa0a97b959
use deleteLater to ensure that AvatarVoxelSystem delete is on correct thread
2013-10-10 16:23:22 -07:00
Andrzej Kapolka
6e012ea6d2
When computing average model color, skip eyes and weight rest by number of
...
vertices.
2013-10-10 16:04:42 -07:00
Philip Rosedale
43e01ee105
Merge pull request #1039 from birarda/data-server
...
add ability to jump to a user's domain and location
2013-10-10 15:37:21 -07:00
ZappoMan
c5d3f53bd6
Merge pull request #1037 from birarda/infoview
...
fix InfoView full screen bug
2013-10-10 15:29:55 -07:00
ZappoMan
3ad2a6edaa
remove dead code
2013-10-10 15:28:55 -07:00
ZappoMan
f3aa82624f
progress on keep local voxels
2013-10-10 15:28:06 -07:00
ZappoMan
0a6ddf108f
progress on keep local voxels
2013-10-10 15:25:33 -07:00
ZappoMan
c86bad77c9
progress on keep local voxels
2013-10-10 15:23:22 -07:00
Andrzej Kapolka
42d3ee450b
Fix for seg fault on exit.
2013-10-10 15:15:28 -07:00
Stephen Birarda
33e6e1925e
handle get of multiple values in single packet
2013-10-10 13:50:03 -07:00
Andrzej Kapolka
4c073426c8
Ball and cone color from average geometry colors.
2013-10-10 13:41:50 -07:00
Stephen Birarda
7851251e5d
indicate number of values being put to data-server
2013-10-10 11:51:18 -07:00
Stephen Birarda
d37ae7da1b
include the number of keys with data-server get
2013-10-10 11:49:14 -07:00
Andrzej Kapolka
14dfa72284
Rotation fix.
2013-10-10 11:25:11 -07:00
Stephen Birarda
11437054a6
add line to fix InfoView full screen bug
2013-10-10 11:01:07 -07:00
Andrzej Kapolka
052c8246fa
Let's use the "eye level" position.
2013-10-10 10:49:19 -07:00
Andrzej Kapolka
0881cd4c92
Merge branch 'master' of https://github.com/worklist/hifi
2013-10-10 10:32:19 -07:00
Andrzej Kapolka
ea639afe44
Use the head joint position so that lean affects camera position in first
...
person mode.
2013-10-10 10:31:34 -07:00
Philip Rosedale
72273d1469
indent
2013-10-10 10:14:35 -07:00
Philip Rosedale
dd09d686fc
indents
2013-10-10 09:53:43 -07:00
Philip Rosedale
d8dcb6aa44
bracket placement
2013-10-09 23:26:44 -07:00
Philip Rosedale
632dd2fa7d
code review, added Doxygen style comments
2013-10-09 23:23:20 -07:00
Philip Rosedale
27a892fa55
Removed old head rotation code, menu items, added ability to turn off faceshift head rotation
2013-10-09 22:46:34 -07:00
Philip Rosedale
1d1e1f6d41
spacing
2013-10-09 17:21:39 -07:00
Philip Rosedale
5509324ffd
Change particles to use vertex arrays, further speedups
2013-10-09 17:18:22 -07:00
Stephen Birarda
fb39ad0a55
comment out data-server packet queueing until sequencing is implemented
2013-10-09 17:03:02 -07:00
Stephen Birarda
4c148c6f3a
ask data-server for domain + position of user from goToUser
2013-10-09 16:58:27 -07:00
Stephen Birarda
cd504e2293
use QString for DataServerClient keys
2013-10-09 16:50:54 -07:00
Stephen Birarda
3231776e76
add API for Profile userString and multiple value requests
2013-10-09 16:45:02 -07:00
Philip Rosedale
cabb5112dd
Merge branch 'master' of https://github.com/worklist/hifi
2013-10-09 16:03:38 -07:00
Philip Rosedale
ab4b09ca39
More coding standard fixes to particle cloud
2013-10-09 16:03:06 -07:00
Stephen Birarda
d66137e314
add a Go To User option to the menu
2013-10-09 15:36:33 -07:00
Stephen Birarda
f7a0dd514e
load NodeList and Profile settings with menu settings load
2013-10-09 15:23:07 -07:00
Andrzej Kapolka
083c5e34b2
Fix for non-Faceshift eye and mouth movement.
2013-10-09 15:11:14 -07:00
Philip Rosedale
4afa82d626
Merge branch 'master' of https://github.com/worklist/hifi
2013-10-09 15:10:16 -07:00
Philip Rosedale
85a15a22fa
Further code cleanup on particle cloud
2013-10-09 15:10:03 -07:00
Stephen Birarda
d3b95d19a1
send the user's last domain and position to data-server
2013-10-09 15:09:57 -07:00
Andrzej Kapolka
dfa3ea78da
Reverse direction of eye offset.
2013-10-09 14:38:05 -07:00
Philip Rosedale
58d6c4c97a
Cleaning up particle code
2013-10-09 14:28:00 -07:00
ZappoMan
d939d3aaae
Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels
2013-10-09 14:02:40 -07:00
ZappoMan
c25b03dd58
first cut at keeping local voxels
2013-10-09 14:02:31 -07:00
Stephen Birarda
9112efaa36
move username change to Login, add lastPosition and lastDomain
2013-10-09 13:00:05 -07:00
Philip Rosedale
bcb3e082f6
Merge branch 'master' of https://github.com/worklist/hifi
2013-10-09 12:17:43 -07:00
Andrzej Kapolka
604d6399eb
Fix for grow/shrink rates.
2013-10-09 11:58:27 -07:00
Andrzej Kapolka
5511c02449
Merge branch 'master' of https://github.com/worklist/hifi
2013-10-09 11:53:08 -07:00
Andrzej Kapolka
0a54c2f1e9
Tweaking the growing heads.
2013-10-09 11:52:56 -07:00
Philip Rosedale
8dc84fc841
Merge branch 'master' of https://github.com/worklist/hifi
2013-10-09 11:44:56 -07:00
Stephen Birarda
478214f9da
fix Profile include from DataServerClient
2013-10-09 11:14:26 -07:00
Andrzej Kapolka
a679517596
Fix for jaundiced eyes.
2013-10-09 11:10:51 -07:00
Stephen Birarda
268a64d3d5
change data-server hostname to hifi global data-server
2013-10-09 10:27:02 -07:00
Stephen Birarda
f09888dd1b
Merge branch 'master' of github.com:worklist/hifi into nameserver
2013-10-09 10:21:25 -07:00
Andrzej Kapolka
1b4daa8eb9
No glow on own avatar, only on others when farther than five units away.
2013-10-09 10:17:41 -07:00
Philip Rosedale
906f3c8c60
got basic cloud working
2013-10-08 23:15:29 -07:00
Philip Rosedale
afd553330a
Merge branch 'master' of https://github.com/worklist/hifi
2013-10-08 22:24:34 -07:00
Philip Rosedale
ce2e31ddd5
reconnecting particle cloud
2013-10-08 22:21:55 -07:00
Philip Rosedale
69277ec8ba
Added back field and cloud files
2013-10-08 21:49:13 -07:00
Stephen Birarda
9c6cdcc70b
complete setting of user model from data-server
2013-10-08 15:39:04 -07:00
Andrzej Kapolka
87bdd2fb1a
When in mirror mode and using a blend face, try to position the camera so as
...
to look directly into the face's eyes.
2013-10-08 15:09:56 -07:00
Stephen Birarda
233c1599bd
leverage existing URL update rate for interim face model update solution
2013-10-08 14:25:53 -07:00
Andrzej Kapolka
3cca3dc894
Reset fix.
2013-10-08 14:06:04 -07:00
Stephen Birarda
10f29dfe90
ask the data-server for a face mesh on UUID change
2013-10-08 14:02:57 -07:00
Stephen Birarda
15ddd9989b
ovverride UUID setter in Avatar for DataServerClient get request
2013-10-08 13:59:28 -07:00
Andrzej Kapolka
15f7b70269
Let's actually use the transform we constructed.
2013-10-08 13:54:54 -07:00
Stephen Birarda
b17e12460c
shift get/set of face model URL to Profile class
2013-10-08 13:52:04 -07:00
Stephen Birarda
8bac70e4a5
pass UUID from data-server to avatar-mixer
2013-10-08 13:43:31 -07:00
Andrzej Kapolka
60306af3e9
Default springiness, allow springiness on non-blended meshes.
2013-10-08 13:35:02 -07:00
Stephen Birarda
6bd71da84e
pack the UUID with the avatar data
2013-10-08 13:31:39 -07:00
Stephen Birarda
97966592e1
Merge branch 'master' of github.com:worklist/hifi into nameserver
2013-10-08 13:19:55 -07:00
Stephen Birarda
f5912f07a8
make sure username is not empty before requesting faceMesh
2013-10-08 12:45:18 -07:00
Stephen Birarda
d843285db7
save profile to settings, fix UUID storage
2013-10-08 12:40:09 -07:00
Stephen Birarda
ae59ce22b7
send an empty key when making a UUID request
2013-10-08 12:22:02 -07:00
Stephen Birarda
85edb93710
add a Profile class to hold user data from data-server
2013-10-08 12:13:45 -07:00
Stephen Birarda
56b71eb61a
re-send data-server GET requests if they are unmatched
2013-10-08 11:33:14 -07:00
Andrzej Kapolka
506f667083
More springy, more damp. Removed unused variable.
2013-10-08 11:26:15 -07:00
Andrzej Kapolka
acaf7d4f88
Merge branch 'master' of https://github.com/worklist/hifi into springy
2013-10-08 11:22:03 -07:00
Andrzej Kapolka
6a043145d3
Merge branch 'master' of https://github.com/worklist/hifi into springy
...
Conflicts:
interface/src/renderer/FBXReader.cpp
2013-10-08 11:21:47 -07:00
ZappoMan
5e6e15db41
Merge pull request #1025 from ZappoMan/voxel_render_modes
...
two possible crash fixes
2013-10-08 11:21:10 -07:00
Stephen Birarda
892614470e
Merge branch 'master' of github.com:worklist/hifi into nameserver
2013-10-08 11:19:32 -07:00
Andrzej Kapolka
e3436eed91
Fixes for eyes rolling back in head, macaw head without mapping file.
2013-10-08 11:18:12 -07:00
Andrzej Kapolka
ce23b415e0
Fix for macaw head without mapping file.
2013-10-08 11:11:01 -07:00
Andrzej Kapolka
b22334730d
Fix for eyes rolling back in head.
2013-10-08 11:01:31 -07:00
Andrzej Kapolka
184e0f4439
Merge branch 'master' of https://github.com/worklist/hifi into springy
2013-10-08 10:34:53 -07:00
ZappoMan
89a4ea6470
two possible crash fixes
2013-10-08 09:56:47 -07:00
stojce
a795a5b88f
#19435 - Remove 'Perlin Face' option from menus and code
2013-10-08 18:23:51 +02:00
ZappoMan
aa80ec3497
cleanup code for PR
2013-10-07 19:46:52 -07:00
ZappoMan
54364a235d
tighten up mutex locks to keep at 60 fps
2013-10-07 19:43:45 -07:00
Andrzej Kapolka
b0bc122a48
Got some actual damped oscillation going.
2013-10-07 18:02:03 -07:00
Stephen Birarda
7964f360ab
add method to DataServerClient to resend unmatched packets
2013-10-07 17:52:21 -07:00
ZappoMan
f6981feacf
added various render mode options, including voxels as points
2013-10-07 17:46:22 -07:00
Andrzej Kapolka
3448ceccd2
Progress towards a spring-mass model.
2013-10-07 17:25:46 -07:00
Stephen Birarda
26d5e2cfec
clear the face model URL if the username is changed in preferences
2013-10-07 17:24:07 -07:00
Stephen Birarda
4b62026c25
shore up receipt of face mesh URL from data-server
2013-10-07 17:06:38 -07:00
Stephen Birarda
b33843fddc
ask for a mesh if username is present on login or is changed
2013-10-07 13:52:46 -07:00
Stephen Birarda
e9e77d8276
set username instead of UUID in Interface preferences
2013-10-07 13:35:16 -07:00
Stephen Birarda
f36fd47ef7
store username and not UUID for MyAvatar
2013-10-07 12:17:47 -07:00