Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-08 11:58:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
22572 commits 25 branches 0 tags 1.1 GiB
Commit graph

143 commits

Author SHA1 Message Date
Stephen Birarda
d3bbd251db move Logging to LogHandler 2014-10-28 13:59:23 -07:00
Stephen Birarda
3c71d4d96e add ability for domain-server to restart after setting save 2014-09-26 11:26:21 -07:00
Atlante45
8b4a910040 Fix timestamp timer not fired 2014-04-25 12:19:18 -07:00
Atlante45
3eeb3a539d Fixed lack of resolution in usecTimestampNow() 2014-04-22 11:48:43 -07:00
Stephen Birarda
1c861fbecb resolve conflicts on merge with upstream master 2014-04-09 15:36:15 -07:00
Stephen Birarda
6ce5a24460 missed copyright cleanups in apache header 2014-04-09 09:44:38 -07:00
Stephen Birarda
684c6b5372 run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
Stephen Birarda
caf2473df8 add a DTLSSession object to handle GnuTLS DTLS sessions 2014-04-01 13:08:00 -07:00
Stephen Birarda
dc38b27485 using GnuTLS read self-signed key and cert on DS load 2014-03-31 12:31:34 -07:00
Stephen Birarda
9ae06913a0 remove QCA which only supports DTLS v1 2014-03-31 09:45:19 -07:00
ZappoMan
bde2146b1b whitespace cleanup 2014-03-23 18:14:36 -07:00
ZappoMan
9c7ffffbae fix some windows issues 
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
 2014-03-23 18:10:22 -07:00
Stephen Birarda
a376ebbca2 make DomainServer a proper QCoreApplication instance, closes #1313 2013-12-05 10:00:20 -08: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
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
b2f7115aef remove document root debug 2013-09-17 09:18:46 -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