Commit graph

56574 commits

Author SHA1 Message Date
David Rowe
e1dcf01706 Better settings text 2017-06-23 17:33:02 +12:00
David Rowe
9d0407cbdf Merge branch 'master' into 21396 2017-06-23 16:52:04 +12:00
David Rowe
b26f5c5811 Clear finger joints when finger poses no longer being updated 2017-06-23 16:15:40 +12:00
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
3ea7b82d61 Merge pull request #10796 from birarda/bug/audio-codec-replication
check for codec changes for replicated agents
2017-06-22 16:51:40 -07:00
Clément Brisset
d182f06d1e Merge pull request #10786 from Atlante45/feat/replicants
Prevent replication flat loops
2017-06-22 16:41:59 -07:00
Zach Fox
749082c580 Merge pull request #10794 from zfox23/lightInstaller_forceNoLaunch
Add a /forceNoLaunch switch to the installer
2017-06-22 16:38:20 -07:00
David Rowe
8682cee17a Refactoring 2017-06-23 11:33:29 +12:00
Stephen Birarda
ec30d9ad5c always re-process codec for replicated agent 2017-06-22 16:18:46 -07:00
Zach Fox
e5666fbb2f Two different options for server and client 2017-06-22 15:44:55 -07:00
Atlante45
71d2540a23 Prevent replication flat loops 2017-06-22 15:22:32 -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
Zach Fox
2318b6aef8 Add a /forceNoLaunch switch to the installer 2017-06-22 15:02:59 -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
Brad Hefta-Gaub
a2fa1cd532 Merge pull request #10757 from CainFoool/master
WL 21386: ShortBow Improvements
2017-06-22 13:38:41 -07:00
Andrew Meadows
62e862fef0 Merge pull request #10733 from Menithal/21384
21384: Added Support to Disabling flight from client side
2017-06-22 13:38:01 -07:00
Howard Stearns
922b66d447 Merge pull request #10779 from howard-stearns/no-sand-box-if-new-install-option
installer allows /nSandboxIfNew command line switch
2017-06-22 13:37:28 -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
Brad Hefta-Gaub
7668fbb7a0 Merge pull request #10755 from seefo/fb5278
Fixed an issue where toolbar buttons duplicated themselves when reloading scripts
2017-06-22 13:35:05 -07:00
Brad Hefta-Gaub
197006e3d3 Merge pull request #10780 from kencooke/audio-hrtf-avx512
HRTF optimizations
2017-06-22 13:34:05 -07:00
Stephen Birarda
8b7eaaa23a activate the public socket always for upstream/downstream servers 2017-06-22 13:33:57 -07:00
Stephen Birarda
0e0f216aed cleanup indentation in packet filter 2017-06-22 13:33:57 -07:00
Stephen Birarda
015284c0e6 do not attempt to replicate audio stream stats 2017-06-22 13:33:57 -07:00
Stephen Birarda
e00bbfb2fd make upstream nodes setting advanced 2017-06-22 13:33:57 -07:00
Stephen Birarda
a6d34010b2 use reliable packet lists for replicated identity 2017-06-22 13:33:57 -07:00
Stephen Birarda
2de6185855 remove avatar mixer destructor 2017-06-22 13:33:57 -07:00
Stephen Birarda
d05996c13d fix upstream filter check, audio interest set 2017-06-22 13:33:57 -07:00
Stephen Birarda
6da5a63152 verify replicated packets in packet filter 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
howard-stearns
cec4b4e86b change var to a global per CR 2017-06-22 12:54:30 -07:00
howard-stearns
6a5dfd6fc5 Merge branch 'master' of https://github.com/highfidelity/hifi into no-sand-box-if-new-install-option 2017-06-22 12:13:59 -07:00
Stephen Birarda
86b2382f7c Merge pull request #10785 from birarda/bug/manage-avatar-identity
push AvatarData sequence number when managing identity data for agent
2017-06-22 12:02:42 -07:00
Stephen Birarda
ccbae07170 rename _sequenceNumber to _lastSequenceNumber 2017-06-22 11:23:58 -07:00
Stephen Birarda
42cceb02a4 push sequence number when managing identity data for agent 2017-06-22 11:10:43 -07:00
Clément Brisset
48aadb2899 Merge pull request #10775 from 1P-Cusack/21401
Adding support for loading obj.gz files in ModelCache.
2017-06-22 11:03:23 -07:00
Andrew Meadows
e5602aa7d3 Merge pull request #10773 from Atlante45/fix/refresh-content
Fix reload content for baked skyboxes
2017-06-22 08:40:42 -07:00
Andrew Meadows
424848f8e3 Merge pull request #10769 from sethalves/fix-linux-fbx-lib
have cmake find fbx library on Linux
2017-06-22 08:37:57 -07:00
1P-Cusack
f8c30c70e8 Addressing some feedback. Making the .obj.gz checks more specific and adding an exception if gunzip fails. 2017-06-22 11:21:19 -04:00
David Kelly
34edd95926 Merge pull request #10776 from davidkelly/dk/avatarUrlSwitch
new switches to override avatarURL
2017-06-22 07:11:29 -07:00
David Kelly
5da01f0074 updated comments 2017-06-22 07:09:24 -07:00