Stephen Birarda
|
3449ddc9a0
|
remove an added ga
|
2013-09-30 14:03:17 -07:00 |
|
Stephen Birarda
|
e2d68f5538
|
have DS clear config file is new config is passed
|
2013-09-30 14:03:02 -07:00 |
|
Stephen Birarda
|
32314ad540
|
have VS send UUID with check in for static assignment behavior
|
2013-09-30 13:34:22 -07:00 |
|
Stephen Birarda
|
e63dfadcde
|
allow repeated check ins from existing node
|
2013-09-30 13:24:55 -07:00 |
|
Stephen Birarda
|
0e5c5886b6
|
touchups to DS with static assignment file
|
2013-09-30 13:11:46 -07:00 |
|
Stephen Birarda
|
a8d55644e9
|
Assignment as LinkedData, add back to queue on node death
|
2013-09-30 11:04:42 -07:00 |
|
Stephen Birarda
|
fce97e2754
|
remove a space in DomainServer header
|
2013-09-30 10:44:34 -07:00 |
|
Stephen Birarda
|
bb32da12f1
|
complete removal of fervor and C++11 array
|
2013-09-30 10:30:18 -07:00 |
|
Stephen Birarda
|
db1dacbbf4
|
some refactoring for DS, add create assignments to file
|
2013-09-26 15:56:41 -07:00 |
|
Stephen Birarda
|
70c5d3e349
|
decouple DS from main, move to C++11
|
2013-09-26 15:03:43 -07:00 |
|
Stephen Birarda
|
6fe47b47a3
|
handle unmapping of assignment file on SIGTERM, add created to static map
|
2013-09-26 09:59:37 -07:00 |
|
Stephen Birarda
|
bed4819313
|
inital setup for static assignment mapped file
|
2013-09-24 14:41:26 -07:00 |
|
Stephen Birarda
|
77193dd707
|
change the placeholder javascript to be 32x32 game of life
|
2013-09-23 09:56:07 -07:00 |
|
Stephen Birarda
|
3d1c77d047
|
expose the TREE_SCALE to JS
|
2013-09-20 14:47:36 -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 |
|
ZappoMan
|
c087632d53
|
have Domain Server treat Voxel Servers the same as Audio Mixers and Avatar Mixers
|
2013-09-19 13:20:27 -05:00 |
|
Stephen Birarda
|
3b976500ce
|
stylistic and memory management fixes
|
2013-09-18 17:55:13 -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
|
b0421cb9d3
|
Merge pull request #953 from ZappoMan/multi_VS_assigments
Handle --voxelServerConfig properly
|
2013-09-18 14:20:12 -07: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 |
|
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 |
|
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
|
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
|
06f739a623
|
pass voxelServerConfig from domain-server through Assignment _payload to VoxelServer
|
2013-09-18 07:23:37 -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
|
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 |
|
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 |
|
Stephen Birarda
|
17a210813b
|
repairs to subclasses of assignment
|
2013-09-17 15:20:34 -07:00 |
|
ZappoMan
|
2388cfc8e0
|
first cut at making VoxelServer class run with configuration or standalone
|
2013-09-17 14:33:31 -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 |
|
Stephen Birarda
|
2cfa45e4f8
|
allow the assignment-client to specify the type of assignment it desires
|
2013-09-17 12:09:10 -07:00 |
|
Stephen Birarda
|
74a0b8a7b5
|
resolve conflicts on merge with upstream master
|
2013-09-17 11:50:30 -07:00 |
|
Stephen Birarda
|
76df707e31
|
add the ability to ask for multiple instances from JS page
|
2013-09-17 11:48:08 -07:00 |
|
Stephen Birarda
|
0e19d9a53a
|
add handling for number of instances to domain-server
|
2013-09-17 11:19:13 -07:00 |
|
Stephen Birarda
|
063896f92a
|
Merge pull request #941 from ZappoMan/voxel_server_assignments
Voxel Server as a Assignment Client task
|
2013-09-17 10:51:31 -07:00 |
|
Stephen Birarda
|
a45d64a214
|
add ability to send a voxel in JS via VoxelScriptingInterface
|
2013-09-17 10:49:51 -07:00 |
|
Stephen Birarda
|
a238fb959f
|
link platform appropriate dl libraries on UNIX for civetweb
|
2013-09-17 09:30:40 -07:00 |
|
Stephen Birarda
|
b2f7115aef
|
remove document root debug
|
2013-09-17 09:18:46 -07:00 |
|
Stephen Birarda
|
291d34d49f
|
lowercase civetweb library in domain-server so it isn't so loud
|
2013-09-17 09:16:10 -07:00 |
|
ZappoMan
|
100eda6960
|
allow voxel servers in standalone mode to work with new domain server and assignment client
|
2013-09-16 19:56:34 -07:00 |
|