Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 12:53:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
6280 commits 71 branches 56 tags 1.2 GiB
Commit graph

6280 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
ZappoMan
642b446d6f tweak to payload parsing 2013-09-18 07:30:04 -07:00
ZappoMan
06f739a623 pass voxelServerConfig from domain-server through Assignment _payload to VoxelServer 2013-09-18 07:23:37 -07:00
Stephen Birarda
b6548303d1 Merge pull request #950 from ZappoMan/multi_VS_assigments 
Make VoxelServer class run as multiple instances
 2013-09-17 17:43:33 -07:00
ZappoMan
4a821d0874 Merge branch 'master' of https://github.com/worklist/hifi into multi_VS_assigments 2013-09-17 17:35:13 -07:00
ZappoMan
3145a543d9 fixed CR feedback 2013-09-17 17:34:47 -07:00
ZappoMan
bf2a3d6742 Merge pull request #951 from birarda/assignment 
have domain-server reject audio and avatar mixers who try to check in with bad UUID
 2013-09-17 17:32:01 -07:00
ZappoMan
1bfd23e3de CR feedback 2013-09-17 17:27:20 -07:00
Stephen Birarda
3f381eeae8 put unconfirmed AM assignments at the back of the queue 2013-09-17 17:24:22 -07:00
ZappoMan
5f9ac5c280 second constructor 2013-09-17 17:19:39 -07:00
Andrzej Kapolka
596d0ac471 Subtract the neutral position from the blendshapes. 2013-09-17 17:01:17 -07:00
ZappoMan
f75b480b0e correctly hook up VoxelSendThread in VoxelNodeData 2013-09-17 16:40:39 -07:00
Stephen Birarda
001432ec55 have domain-server reject audio and avatar mixers with bad UUID 2013-09-17 16:40:30 -07:00
Andrzej Kapolka
617b3d67cf I think we need to treat the blend shapes as offsets from neutral. 2013-09-17 16:11:07 -07:00
ZappoMan
49c4075277 Merge branch 'master' of https://github.com/worklist/hifi into multi_VS_assigments 2013-09-17 16:00:32 -07:00
ZappoMan
2b9290a9e3 moving VoxelServer globals to member variables 2013-09-17 15:47:39 -07:00
ZappoMan
e86b4f2d8d moving VoxelServer globals to member variables 2013-09-17 15:47:29 -07:00
ZappoMan
d074a34954 Merge pull request #948 from birarda/assignment 
make assignment targets subclasses of assignment to have access to assignment data
 2013-09-17 15:46:44 -07:00
Stephen Birarda
89546f7140 repairs to temporary standalone voxel-server for assignment subclass 2013-09-17 15:38:54 -07:00
Stephen Birarda
8bb77ecc9e type squish for deployed assignment 2013-09-17 15:23:49 -07:00
Andrzej Kapolka
558d3d41a6 First attempt at blending. 2013-09-17 15:22:06 -07:00
Stephen Birarda
17a210813b repairs to subclasses of assignment 2013-09-17 15:20:34 -07:00