Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-31 13:11:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
49717 commits 71 branches 59 tags 1.2 GiB
Commit graph

1529 commits

Author SHA1 Message Date
howard-stearns
3358d58d01 Merge branch 'master' of https://github.com/highfidelity/hifi into minimum-edit-entity-filter 2017-01-23 12:21:32 -08:00
Stephen Birarda
ab7ce19211 use html_id for settings anchor if no name 2017-01-23 09:49:46 -08:00
Zach Fox
44eaa64a1d It was writeString() all along! 2017-01-19 11:25:17 -08:00
Zach Fox
534fcd9399 Potential fix 2017-01-19 10:20:36 -08:00
Zach Fox
1175752e1d Cleanup after rebase 2017-01-18 12:55:24 -08:00
Zach Fox
346cfbfe02 First checkpoint 2017-01-18 12:55:24 -08:00
howard-stearns
d9182cd38d Merge branch 'master' of https://github.com/highfidelity/hifi into minimum-edit-entity-filter 2017-01-18 10:02:27 -08:00
ZappoMan
5e49e8025a improve comment in domain settings 2017-01-16 21:06:38 -06:00
Zach Fox
e22c1ac30e Fix the bug 2017-01-16 11:48:51 -08:00
howard-stearns
f6446c6806 minimum entity edit filter 2017-01-13 13:18:24 -08:00
David Kelly
36792e005a initial commit 2016-12-19 14:19:39 -08:00
David Kelly
c0d7c06d4a Merge pull request #9221 from davidkelly/dk/machineFingerprintToDS 
Adding Machine Fingerprint to Domain Server permissions
 2016-12-19 11:49:33 -08:00
Zach Fox
4bfc04a6ec Small CR changes 2016-12-19 10:41:18 -08:00
Zach Fox
ee2f600d2e Fix username display bug 2016-12-19 10:20:08 -08:00
Zach Fox
a912fec496 PR comments; need particular fix on Master for full QA 2016-12-19 10:20:08 -08:00
Zach Fox
e940daf5b4 Comments and clarity 2016-12-19 10:20:08 -08:00
Zach Fox
2c5db54b08 Super close 2016-12-19 10:20:08 -08:00
Zach Fox
802e283508 Another checkpoint, getting closer 2016-12-19 10:20:08 -08:00
Zach Fox
c9dc91900f Checkpoint 2016-12-19 10:20:08 -08:00
Brad Davis
2d73588361 Fix stat tracker missing in agents 2016-12-16 17:34:00 -08:00
David Kelly
0553dbdcb7 CR feedback 2016-12-16 17:17:10 -08:00
David Kelly
126ae52cb4 Merge branch 'master' of github.com:highfidelity/hifi into dk/machineFingerprintToDS 2016-12-16 12:17:54 -08:00
David Kelly
4d7f3051a7 Expose Machine Fingerprint perms in DS settings page 
Should be about same as MAC or IP for now, applies whenever you are not
logged in.
 2016-12-16 10:19:37 -08:00
Ryan Huffman
7bb2755913 Add chrome tracing support 2016-12-16 01:14:01 -08:00
Seth Alves
26639aac15 Merge pull request #8789 from Atlante45/fix/settings 
Use JSON for application Settings
 2016-12-15 07:00:46 -08:00
David Kelly
cb14b0e3e0 inital cut, passing fingerprint in 
does permissions same as mac address, more or less.  Not exposed
yet, just a beginning.
 2016-12-14 16:09:13 -08:00
Brad Hefta-Gaub
92632e72b6 make default avatar mixer send bandwidth 5mbps 2016-12-13 17:04:25 -08:00
Zach Pomerantz
f5b4fac46d set default audio threads to 1 2016-12-07 18:47:33 -05:00
Zach Pomerantz
b4638105e3 expose audio mixer threads to gui 2016-11-29 13:32:10 -05:00
Atlante45
3035d43772 Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings 2016-11-21 13:05:08 -08:00
Stephen Birarda
dec4ce79b2 fix comment in mac permission unpack 2016-11-18 14:42:29 -08:00
Stephen Birarda
143225a74c add MAC permission table to domain-server and leverage 2016-11-18 14:40:22 -08:00
Stephen Birarda
47f82a8046 send the mac address with domain-server check in 2016-11-18 13:50:11 -08:00
Stephen Birarda
39afb24982 explictly remove Agent from NIS for other Agents 2016-11-15 10:37:19 -08:00
Stephen Birarda
1791a1c1fe never send agents to other agents 2016-11-15 10:15:17 -08:00
Chris Collins
6581a51bc9 Merge pull request #9052 from davidkelly/dk/2226 
Add ability to mute user
 2016-11-11 16:02:08 -08:00
Clément Brisset
e38da75115 Merge pull request #9053 from huffman/feat/whitelist-ac-ip 
Add AC ip address whitelist to domain server
 2016-11-11 15:03:21 -08:00
Ryan Huffman
528b8e93f0 Remove extraneous logging in DomainServer for whitelist 2016-11-11 14:33:34 -08:00
Ryan Huffman
fc1a7255f6 Remove unneeded 'this->' 2016-11-11 14:24:28 -08:00
Ryan Huffman
e177004d71 Fix ds not restarting when changing ac whitelist 2016-11-11 14:23:16 -08:00
Ryan Huffman
d522d03bd2 Add repeated message suppression to request assignment packets 2016-11-11 11:29:52 -08:00
David Kelly
96f6cb7ae4 whitespace 2016-11-11 11:24:06 -08:00
Ryan Huffman
969cbf4cb0 Update domain server subnet whitelist description 2016-11-11 10:46:40 -08:00
Ryan Huffman
bd1bcaf1a4 Clean up subnet whitelist implementation 2016-11-11 10:38:56 -08:00
Ryan Huffman
d691aa3302 Update naming for subnet whitelist in ds 2016-11-11 10:32:45 -08:00
Ryan Huffman
ca6a74d63d Add whitelist filtering to assignment requests 2016-11-11 10:19:53 -08:00
Ryan Huffman
63cfbf55ca Add ip address whitelist processing to domain server 2016-11-11 10:19:21 -08:00
Ryan Huffman
edb8d14507 Add ac address whitelist to domain server settings 2016-11-11 10:18:16 -08:00
David Kelly
9c8f22e0e7 straight to audio mixer 
since we can get the canKick there too.  (doh)
 2016-11-11 09:30:58 -08:00
Stephen Birarda
7f46714645 drop the incorrect scale from domain settings 2016-11-10 16:53:56 -08:00