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 |
|
ZappoMan
|
92fb393e14
|
allow standalone voxel-server to specify port and domain, add VoxelServerType to assignment-client
|
2013-09-16 19:34:07 -07:00 |
|
Stephen Birarda
|
d6e3a4f3ba
|
reference domain-server web files relative to executable dir
|
2013-09-16 12:56:36 -07:00 |
|
Stephen Birarda
|
67389589ef
|
replace mongoose webserver with MIT licensed civetweb
|
2013-09-16 12:47:38 -07:00 |
|
Stephen Birarda
|
83ed162d49
|
include jquery and remove javascript includes from net
|
2013-09-13 12:42:14 -07:00 |
|
Stephen Birarda
|
fef54728ca
|
fix path for javascript save
|
2013-09-13 12:12:20 -07:00 |
|
Stephen Birarda
|
c40e848220
|
move DS web to resources for deploys
|
2013-09-13 11:21:03 -07:00 |
|
Stephen Birarda
|
d089991237
|
add handling of Agent assignments to Assignment, DS, AC
|
2013-09-13 11:14:00 -07:00 |
|
Stephen Birarda
|
49b72370be
|
fix UUID getter to match the private variable
|
2013-09-12 17:08:06 -07:00 |
|
Stephen Birarda
|
f878b17798
|
fix DS reply to node on same box to remove check in AC
|
2013-09-12 17:03:05 -07:00 |
|
Stephen Birarda
|
2578516940
|
talk to AC on loopback when on same node
|
2013-09-12 16:47:06 -07:00 |
|
Stephen Birarda
|
0d69e1cce0
|
expand the same host comparison to check 127.0.0.1
|
2013-09-12 16:31:43 -07:00 |
|
Stephen Birarda
|
25cd800ab4
|
create a UUID with assignments, store JS for script
|
2013-09-12 16:18:53 -07:00 |
|
Stephen Birarda
|
3dd0b40776
|
Merge branch 'assignment' into domain-web-server
|
2013-09-11 14:49:28 -07:00 |
|
Stephen Birarda
|
4ebac574ac
|
fix deque include for domain-server
|
2013-09-11 14:48:51 -07:00 |
|
Stephen Birarda
|
36b2381d79
|
Merge branch 'assignment' into domain-web-server
|
2013-09-11 14:47:26 -07:00 |
|
Stephen Birarda
|
fb8d3e9cf6
|
add a more helpful message to the DS root index.html
|
2013-09-11 14:47:23 -07:00 |
|
Stephen Birarda
|
df4973db6b
|
Merge branch 'master' of github.com:worklist/hifi into domain-web-server
|
2013-09-11 14:44:35 -07:00 |
|
Stephen Birarda
|
dfede2b947
|
rename direction to command for assignment
|
2013-09-11 14:43:37 -07:00 |
|
Stephen Birarda
|
803d2975dc
|
fix queue include
|
2013-09-11 12:43:57 -07:00 |
|
Stephen Birarda
|
04a40be97a
|
remove an extra g
|
2013-09-11 12:29:07 -07:00 |
|
Stephen Birarda
|
e1005288cb
|
prefer that audio-mixer assignment is fulfilled locally
|
2013-09-11 12:25:59 -07:00 |
|
Stephen Birarda
|
ff6fd73187
|
have the domain-server use the new verbose logging message handler
|
2013-09-11 12:17:30 -07:00 |
|
Stephen Birarda
|
b7aa49cf97
|
have DS act as AS and hand assignments directly
|
2013-09-11 12:16:47 -07:00 |
|
Stephen Birarda
|
c71ef85538
|
remove web directory before copying, clean more of ace
|
2013-09-10 14:55:30 -07:00 |
|
Stephen Birarda
|
6256388171
|
remove unused parts of ace editor
|
2013-09-10 14:52:02 -07:00 |
|
Stephen Birarda
|
53e0afa63b
|
open up a JS editor at /assignment on DS webserver
|
2013-09-10 14:42:30 -07:00 |
|
Stephen Birarda
|
1781f1607e
|
add mongoose webserver to domain-server
|
2013-09-10 14:31:20 -07:00 |
|
Stephen Birarda
|
fa521a5dc9
|
handle case where AC is on same network as DS but not AS
|
2013-09-09 18:15:33 -07:00 |
|
Stephen Birarda
|
8077963bb1
|
add standardized logging and leverage forked assignment clients
|
2013-09-09 14:21:33 -07:00 |
|