Commit graph

1640 commits

Author SHA1 Message Date
Seth Alves
8510b60a87 Merge pull request #10789 from sethalves/fix-domain-server-ice-messages
fix the messages printed by domain-server about which name it's using to find ice-servers
2017-06-22 17:59:09 -07:00
Clément Brisset
c47645e075 Merge pull request #10778 from birarda/feat/upstream-in-nodelist
add upstream nodes to NL and verify replicated packet sender
2017-06-22 15:16:23 -07:00
Stephen Birarda
07ccf13ca9 Merge pull request #10788 from seefo/fb5533
Fixed a bug where restart modal was shown when it shouldn't be
2017-06-22 14:44:19 -07:00
seefo
517329030f Merge pull request #10787 from seefo/fb5520
Added confirmation to domain server webpage before restarting
2017-06-22 14:20:35 -07:00
Seth Alves
f1c7d54010 fix the messages printed by domain-server about which name it's using to find ice-servers 2017-06-22 13:53:06 -07:00
seefo
d87a55d6e6 Made requested change to DS restart dialog message 2017-06-22 13:52:34 -07:00
Stephen Birarda
0c7baa3ce4 remove an extra blank line 2017-06-22 13:36:58 -07:00
Stephen Birarda
dd44a81791 verify that replication server type is also present 2017-06-22 13:36:24 -07:00
seefo
d340c1c68f Fixed a bug where restart modal was shown when it shouldn't be 2017-06-22 13:35:10 -07:00
Stephen Birarda
e00bbfb2fd make upstream nodes setting advanced 2017-06-22 13:33:57 -07:00
Stephen Birarda
ea45e341ee send upstream nodes down to avatar/audio 2017-06-22 13:33:57 -07:00
seefo
48b5989b60 add upstream nodes to domain nodelist 2017-06-22 13:33:57 -07:00
seefo
71cc76e94f Renamed upstream servers setting in domain server 2017-06-22 13:33:31 -07:00
seefo
7eed90bf54 Added Upstream Servers setting to domain server 2017-06-22 13:33:31 -07:00
seefo
d834a05fd9 Added confirmation to domain server webpage before restarting 2017-06-22 13:27:43 -07:00
Stephen Birarda
01d9812247 Merge pull request #10772 from birarda/bug/domain-double-connect
use existing node ID during repeated connect requests
2017-06-22 13:16:33 -07:00
Stephen Birarda
95704c1ba5 make broadcasting settings advanced 2017-06-21 17:58:19 -07:00
Stephen Birarda
c516dd06e4 Merge pull request #10714 from highfidelity/replicants
add broadcasting/replication to downstream avatar mixers and audio mixers
2017-06-21 17:55:07 -07:00
Stephen Birarda
e39e5c8c3b simplify lambda capture in gate keeper 2017-06-21 16:21:40 -07:00
Stephen Birarda
aeb3f443f8 address code review comments 2017-06-21 16:14:14 -07:00
Stephen Birarda
9285c88e46 check if usernames do not match before using hint ID 2017-06-21 15:34:43 -07:00
Stephen Birarda
3e97b07fc2 Revert "force domain-server to use new ID if node requests connect"
This reverts commit cd023e0384.
2017-06-21 15:14:16 -07:00
Stephen Birarda
3619294761 Merge pull request #10745 from seefo/fb5367
Added a restart button to domain server settings page
2017-06-19 16:35:36 -07:00
seefo
0c7f1cda0f Added a restart button to domain server settings page 2017-06-19 15:01:50 -07:00
seefo
1619d877d3 Made requested changes to domain server settings.js 2017-06-19 13:21:13 -07:00
seefo
705ce4c789 Changed domain server restart/save button behavior to be correct 2017-06-19 12:09:20 -07:00
seefo
3d4b9c82aa Changed indentation to be consistent 2017-06-19 11:56:45 -07:00
seefo
3224bf5af0 Domain server settings will now tell user if saving will restart DS 2017-06-19 11:52:49 -07:00
Stephen Birarda
36b4990114 fix for table additions when there is no initial row 2017-06-15 17:19:05 -07:00
Stephen Birarda
e6ef153148 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/replicants 2017-06-15 15:43:13 -07:00
Stephen Birarda
0565cfa2b7 fix for array additions in DS settings 2017-06-15 14:59:12 -07:00
Stephen Birarda
ea6a38148c Merge branch 'replicants' of https://github.com/highfidelity/hifi into feat/downstream-in-nodelist 2017-06-15 14:30:08 -07:00
Ryan Huffman
330a27b3a0 Fix removing all downstream nodes in settings not killing nodes 2017-06-15 14:27:01 -07:00
Stephen Birarda
94abfc2d6b nomenclature changes from replication to broadcast 2017-06-15 11:47:13 -07:00
Brad Hefta-Gaub
035a9e898f Merge pull request #10684 from howard-stearns/avatar-whitelist
avatar whitelist
2017-06-15 08:45:16 -07:00
Stephen Birarda
2e5d92a537 Merge branch 'replicants' of https://github.com/highfidelity/hifi into feat/downstream-in-nodelist 2017-06-14 17:23:12 -07:00
Stephen Birarda
0fa88db1d3 Merge pull request #10699 from seefo/replicants
Fixed default value bug in dropdowns inside domain server settings
2017-06-14 17:22:55 -07:00
Stephen Birarda
10649c8f6e change new Node flag to isForcedNeverSilent 2017-06-14 17:20:37 -07:00
seefo
0fa172a4ef Fixed default value bug in dropdowns inside domain server settings 2017-06-14 17:19:48 -07:00
Stephen Birarda
224a559602 keep downstream nodes around in domain, alive in upstream 2017-06-14 17:17:14 -07:00
Stephen Birarda
1ed0b693da Merge branch 'replicants' of https://github.com/highfidelity/hifi into feat/downstream-in-nodelist 2017-06-14 16:57:28 -07:00
Ryan Huffman
785156ad9f Move downstram server adding to DS 2017-06-14 16:54:04 -07:00
Stephen Birarda
e818a511b9 cleanup debug in updateReplicatedNodes 2017-06-14 15:07:48 -07:00
Stephen Birarda
54832d995d fix a typo in shouldReplicateNode 2017-06-14 15:05:58 -07:00
Ryan Huffman
67113330b3 Make replicated username list case insensitive 2017-06-14 15:03:54 -07:00
Ryan Huffman
8d5dc21de8 Fix replicated nodes not being properly updated when logging in or changing settings 2017-06-14 15:03:53 -07:00
Clément Brisset
44117ac001 Merge pull request #10694 from highfidelity/master
Update replicants branch with master
2017-06-14 15:01:22 -07:00
Ryan Huffman
7f75a5f7f5 Make replicated username list case insensitive 2017-06-14 13:57:04 -07:00
Ryan Huffman
59a420a358 Fix replicated nodes not being properly updated when logging in or changing settings 2017-06-14 13:53:50 -07:00
howard-stearns
2deb26551f typos in comments/help-strings 2017-06-14 11:56:47 -07:00