Commit graph

6301 commits

Author SHA1 Message Date
Andrzej Kapolka
c049665090 Removed temporary comment. 2013-09-19 16:42:25 -07:00
Andrzej Kapolka
5c841616dc Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-19 16:37:26 -07:00
Andrzej Kapolka
a04ced633e Include the face model URL in the same packet as the avatar voxel URL. 2013-09-19 16:35:25 -07:00
Andrzej Kapolka
fff10375a9 Map the blendshapes by name. 2013-09-19 15:48:33 -07:00
Andrzej Kapolka
116a4e0bad Subtract the deltas. 2013-09-19 15:18:45 -07:00
Andrzej Kapolka
09fa782c61 More work on FBX reading. 2013-09-19 15:05:17 -07:00
Andrzej Kapolka
9c320e9827 Merge pull request #963 from birarda/assignment
domain-server check in and assignment cleanup
2013-09-19 13:07:21 -07:00
Stephen Birarda
23e7278be5 re-use the check in packet sent to the domain-server, allow reset 2013-09-19 12:58:48 -07:00
Stephen Birarda
92c106a6bb refresh the UUID when sending out new AM assignments 2013-09-19 12:30:40 -07:00
Leonardo Murillo
ed9a02b3e7 Merge pull request #962 from birarda/master
changes for docset identification
2013-09-19 12:22:38 -07:00
Stephen Birarda
3e35ab26fa changes for docset identification 2013-09-19 12:19:38 -07:00
Leonardo Murillo
e7c70ee2a0 Merge pull request #961 from birarda/master
have doxygen optionally generate a docset
2013-09-19 12:11:49 -07:00
Stephen Birarda
38b266641a generate a docset for use in Dash and Xcode 2013-09-19 12:07:40 -07:00
Stephen Birarda
7c218da4ea Merge pull request #960 from ZappoMan/multi_VS_assigments
have Domain Server treat Voxel Servers the same as Audio Mixers and Avatar Mixers
2013-09-19 11:43:33 -07:00
ZappoMan
c087632d53 have Domain Server treat Voxel Servers the same as Audio Mixers and Avatar Mixers 2013-09-19 13:20:27 -05:00
ZappoMan
f6754ea9c7 Merge pull request #958 from birarda/master
fixes for InfoView ownership and display
2013-09-18 18:38:57 -07:00
Leonardo Murillo
0a762edb14 Merge pull request #959 from birarda/assignment
assignment cleanup and static DS packet fix
2013-09-18 18:22:41 -07:00
Stephen Birarda
de276eff00 temporary removal of DS packet optimization for NodeList dynamism 2013-09-18 17:56:45 -07:00
Stephen Birarda
3b976500ce stylistic and memory management fixes 2013-09-18 17:55:13 -07:00
Andrzej Kapolka
1bd8ea947a Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-18 17:14:58 -07:00
Stephen Birarda
7b498edcbc remove attached public and local sockets, fully allow custom port 2013-09-18 17:03:14 -07:00
Stephen Birarda
bbbdc4f88c fixes for InfoView ownership and display 2013-09-18 16:42:51 -07:00
Andrzej Kapolka
dfea69ab8f Basic FBX parser. 2013-09-18 16:26:35 -07:00
Stephen Birarda
c277fd8ea6 Merge pull request #957 from birarda/master
cleanup audio debug
2013-09-18 15:21:27 -07:00
Stephen Birarda
5479c5b40f use qDebug for too much time message in AudioMixer 2013-09-18 15:20:55 -07:00
Leonardo Murillo
476ccc0d1c Merge pull request #956 from birarda/master
changes to README for new local stack setup, fix custom domain IP/port
2013-09-18 15:14:55 -07:00
Stephen Birarda
b4f9e393a4 prefer IPv4 address when looking up for domain IP 2013-09-18 15:05:23 -07:00
Stephen Birarda
a9efa169be fix ordering of QHostAdress to s_addr 2013-09-18 14:58:44 -07:00
Stephen Birarda
22d2b52ba9 simplifications to README for new assigned stack 2013-09-18 14:48:49 -07:00
Stephen Birarda
6b8b698f95 Merge pull request #955 from birarda/master
remove call re-setting default setting in InfoView
2013-09-18 14:46:40 -07:00
Stephen Birarda
5393d75281 remove call to re-set default setting in InfoView 2013-09-18 14:39:35 -07:00
Stephen Birarda
b0421cb9d3 Merge pull request #953 from ZappoMan/multi_VS_assigments
Handle --voxelServerConfig properly
2013-09-18 14:20:12 -07:00
ZappoMan
80b1b810ce spacing fix 2013-09-18 16:13:13 -05:00
ZappoMan
a81d5cd9a7 Merge pull request #954 from birarda/ds-port
allow setting of custom DS port from DS and clients
2013-09-18 14:07:11 -07:00
Stephen Birarda
8a901382a3 get rid of local and domain options in interface 2013-09-18 14:01:32 -07:00
Stephen Birarda
9fa695b71c allow setting of custom port via domainHostname setting 2013-09-18 13:50:14 -07:00
Stephen Birarda
ab85c4109d use QHostInfo and QHostAddress for DS changes in NodeList 2013-09-18 13:29:53 -07:00
ZappoMan
ded7a9504b moved printf to qDebug 2013-09-18 13:28:50 -07:00
ZappoMan
65625c8e76 match setPayload() behavior 2013-09-18 13:23:34 -07:00
ZappoMan
b3bcda2227 Merge branch 'master' of https://github.com/worklist/hifi into multi_VS_assigments 2013-09-18 13:20:17 -07:00
ZappoMan
6355f677f7 have voxel server create assignments for child voxel servers 2013-09-18 13:19:19 -07:00
ZappoMan
268248f5e3 Merge pull request #952 from birarda/assignment
Assignment improvements
2013-09-18 13:15:58 -07:00
Stephen Birarda
8c9a14cdbe CR fix to change back to setPayload with const param 2013-09-18 13:09:07 -07:00
Stephen Birarda
d6a8a4eb26 allow custom listen port for domain-server 2013-09-18 12:07:08 -07:00
Stephen Birarda
7220643fe9 default AC to point to DS on localhost and default port 2013-09-18 12:04:09 -07:00
Stephen Birarda
32b507d2ac remove the global assignment-server for now to avoid confusion 2013-09-18 11:05:31 -07:00
Stephen Birarda
f0b834881b de-refs assignments for proper logging 2013-09-18 10:59:52 -07:00
Stephen Birarda
1a82ba2301 handle create assignment requests in domain-server 2013-09-18 10:58:35 -07:00
Stephen Birarda
3fde2887a3 fixes to payload in Assignment 2013-09-18 10:19:45 -07:00
Andrzej Kapolka
6be03ac3df Working on downloading the faces. 2013-09-18 10:10:24 -07:00