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

6487 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
8bac70e4a5 pass UUID from data-server to avatar-mixer 2013-10-08 13:43:31 -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
ZappoMan
5e6e15db41 Merge pull request #1025 from ZappoMan/voxel_render_modes 
two possible crash fixes
 2013-10-08 11:21:10 -07:00
Andrzej Kapolka
4c2ccd92ef Merge pull request #1027 from ey6es/master 
Fixes for eyes rolling back in head, macaw head without mapping file.
 2013-10-08 11:20:24 -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
ZappoMan
89a4ea6470 two possible crash fixes 2013-10-08 09:56:47 -07:00
Philip Rosedale
6b68f81fde Merge pull request #1024 from ZappoMan/voxel_render_modes 
Voxel Rendering Improvements - make it run at 60fps
 2013-10-07 22:36:52 -07: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
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
ZappoMan
8baa863242 fixed PPS bugs in threaded version of PacketSender class 2013-10-07 17:34:41 -07:00
ZappoMan
c6981d1912 have animation server set an appropriate PPS based on it's voxel edit messages 2013-10-07 17:32:55 -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
Stephen Birarda
98f435ccc2 link mesh URL and UUID in prefs to data server client 2013-10-07 12:03:04 -07:00
Stephen Birarda
fea3ca8229 pack string representation of UUID for data server communication 2013-10-07 10:58:26 -07:00
Stephen Birarda
5a7d21f529 add UUID helper class to get UUID string without braces 2013-10-07 10:56:23 -07:00
Stephen Birarda
13232a4c0b stubbing of mechanism to confirm packets sent to data server 2013-10-07 10:45:54 -07:00
Stephen Birarda
4cc9f29c83 initial stub of data server client code in Interface 2013-10-07 09:55:08 -07:00
ZappoMan
825d397e21 Merge pull request #1023 from ZappoMan/wider_view_frustum 
added some timing debugging
 2013-10-05 00:56:55 -07:00
ZappoMan
5f6fb3a3ae added some timing debugging 2013-10-05 00:55:34 -07:00
ZappoMan
15c25d94c2 Merge pull request #1022 from ZappoMan/wider_view_frustum 
added debugging
 2013-10-04 22:49:59 -07:00
ZappoMan
3001917e10 added debugging 2013-10-04 22:49:05 -07:00
Philip Rosedale
3c5d7795e6 Merge pull request #1021 from ZappoMan/wider_view_frustum 
make view frustum oversend and don't remove oversend in client
 2013-10-04 22:08:56 -07:00
ZappoMan
6fce838e2e remove comment 2013-10-04 21:38:47 -07:00
ZappoMan
0c70a05732 make view frustum oversend and don't remove oversend in client 2013-10-04 21:36:21 -07:00
Andrzej Kapolka
86a27c5f69 Merge pull request #1020 from ey6es/master 
Fixes to support the FBX rig exports from Faceshift.
 2013-10-04 17:57:46 -07:00
Andrzej Kapolka
a704a29864 Include a mapping for the names generated by the FBX export. 2013-10-04 17:56:36 -07:00
Andrzej Kapolka
08426fbd9c Handle index-to-direct normals (exported by the Faceshift rig FBX). 2013-10-04 17:49:18 -07:00
Stephen Birarda
e3f830ec09 Merge pull request #1017 from ey6es/master 
Use diffuse color, specular color, and shininess from FBX file.
 2013-10-04 17:11:11 -07:00
Andrzej Kapolka
325ac73d0a Apply color to ambient material property, too. 2013-10-04 17:04:50 -07:00
Andrzej Kapolka
98a999334a Merge pull request #1018 from birarda/master 
less aggresive assignment debugging
 2013-10-04 14:26:56 -07:00
Andrzej Kapolka
5f26177560 Fix for URLs' not being sent: setting the scale calls createMohawk, which 
reseeds the random number generator, breaking "shouldDo."
 2013-10-04 13:42:03 -07:00
Stephen Birarda
b3171679b2 less aggressive debugging of waiting for assignment 2013-10-04 13:25:51 -07:00
Andrzej Kapolka
b281facf45 Remove references to ambient, use the requested alpha. 2013-10-04 10:53:19 -07:00
Andrzej Kapolka
51c868fd28 Apply (some) FBX material properties to rendered meshes. 2013-10-03 18:12:58 -07:00
Philip Rosedale
c99f1646db Merge pull request #1015 from ZappoMan/voxel_render_pipeline_improvement 
Fixes to delete/add voxel sometimes not rendering
 2013-10-03 16:08:12 -07:00
ZappoMan
608c24e258 fix build buster 2013-10-03 15:58:15 -07:00
Andrzej Kapolka
c2e3682f6e Merge pull request #1014 from ey6es/master 
Fix for relative texture paths.
 2013-10-03 15:48:25 -07:00