Stephen Birarda
|
22d2b52ba9
|
simplifications to README for new assigned stack
|
2013-09-18 14:48:49 -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 |
|
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 |
|
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 |
|
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 |
|
Stephen Birarda
|
17a210813b
|
repairs to subclasses of assignment
|
2013-09-17 15:20:34 -07:00 |
|
Stephen Birarda
|
d830351ed6
|
make the assignment targets subclasses of Assignment for access to UUID
|
2013-09-17 14:54:58 -07:00 |
|
ZappoMan
|
2388cfc8e0
|
first cut at making VoxelServer class run with configuration or standalone
|
2013-09-17 14:33:31 -07:00 |
|
ZappoMan
|
25d9281496
|
Merge branch 'master' of https://github.com/worklist/hifi into multi_VS_assigments
|
2013-09-17 13:41:44 -07:00 |
|
ZappoMan
|
386250cff8
|
remove hacked payloads
|
2013-09-17 13:41:04 -07:00 |
|
ZappoMan
|
6344ae8fd3
|
Merge pull request #947 from birarda/master
add API to attach payloads to assignments
|
2013-09-17 13:39:48 -07:00 |
|
Stephen Birarda
|
fb7927d326
|
cleanup check for attached socket
|
2013-09-17 13:28:19 -07:00 |
|
Stephen Birarda
|
3f2dc7a28d
|
add a getter for the number of bytes in the payload
|
2013-09-17 13:27:17 -07:00 |
|
Stephen Birarda
|
94f04a9806
|
add API to attach payloads to assignments
|
2013-09-17 13:24:25 -07:00 |
|
ZappoMan
|
4932c3266f
|
moving to Assignment payload style implementation
|
2013-09-17 13:22:09 -07:00 |
|
ZappoMan
|
ad4dea129c
|
Merge branch 'master' of https://github.com/worklist/hifi into multi_VS_assigments
|
2013-09-17 12:18:51 -07:00 |
|
ZappoMan
|
48a579ae49
|
first cut at domain server config support
|
2013-09-17 12:18:46 -07:00 |
|
ZappoMan
|
0e6dae6403
|
Merge pull request #946 from birarda/assignment
improvments to assignment flow
|
2013-09-17 12:17:58 -07:00 |
|