Commit graph

56498 commits

Author SHA1 Message Date
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
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
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
Seth Alves
b1119ff465 more changes to get oven building on Linux 2017-06-21 20:10:54 -07:00
Stephen Birarda
e2f6ad8306 Merge pull request #10781 from birarda/feat/replicants-advanced
make broadcasting settings advanced in DS settings
2017-06-21 19:28:19 -07:00
Seth Alves
5277a0803c Merge branch 'master' of github.com:highfidelity/hifi into fix-linux-fbx-lib 2017-06-21 18:59:58 -07:00
Seth Alves
c70365d04a Merge pull request #10729 from druiz17/hand-pucks
Hand pucks and Calibration UI
2017-06-21 18:10:15 -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
Howard Stearns
ea5b074f6e Merge pull request #10758 from howard-stearns/event-installer-interface-options
Event installer interface options
2017-06-21 16:46:06 -07:00
Ryan Huffman
06a305d04b Merge pull request #10777 from birarda/feat/replicants
address code review comments
2017-06-21 16:24:02 -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
David Kelly
92cbb86e8b remove debugging 2017-06-21 16:09:08 -07:00
David Kelly
94a33fea94 new switches to override avatarURL 2017-06-21 16:03:05 -07:00
1P-Cusack
781e2f409f Adding support for loading obj.gz files in ModelCache. 2017-06-21 18:50:39 -04:00
Stephen Birarda
9285c88e46 check if usernames do not match before using hint ID 2017-06-21 15:34:43 -07:00
Atlante45
4a552affe6 Fix reload content for baked skyboxes 2017-06-21 15:19:03 -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
Dante Ruiz
c4699e00ca added hand offsets 2017-06-21 23:10:08 +01:00
Seth Alves
0d9aa8182e have cmake find fbx library on Linux 2017-06-21 17:10:19 -04:00
Clément Brisset
4929939501 Merge pull request #10768 from Atlante45/fix/skyboxes
Fix skyboxes sometimes not showing
2017-06-21 13:56:42 -07:00
Chris Collins
f3ae1d8078 Merge pull request #10750 from Atlante45/master
Stable -> Master
2017-06-21 13:34:28 -07:00
Brad Hefta-Gaub
88a4f5c576 Merge pull request #10766 from humbletim/sort-running-scripts
Sort Running Scripts... list alphabetically
2017-06-21 13:08:47 -07:00
Brad Hefta-Gaub
4ddb5e8866 Merge pull request #10562 from huffman/fix/graceful-controls
Improvements to gracefulControls.js
2017-06-21 12:52:36 -07:00
Brad Hefta-Gaub
4f632005b6 Merge pull request #10372 from rabelaiis/21300
Add entity script for balloon spawner and sample json entity with us…
2017-06-21 12:50:52 -07:00
Atlante45
49623fefd8 Fix Skyboxes sometimes not showing 2017-06-21 11:40:32 -07:00
Anthony Thibault
a12109ed26 Merge pull request #10761 from hyperlogic/bug-fix/avatar-no-eyes
Bug Fixes for Eyeless Avatars
2017-06-21 10:59:55 -07:00
Brad Hefta-Gaub
f7d42c782d Merge pull request #10764 from thoys/feat/ac-location-jsapi
Expose location scripting interface to Agent (AC script)
2017-06-21 10:22:48 -07:00
Brad Hefta-Gaub
04d74a715a Merge pull request #10765 from samcake/brown
Adding Profiling for script engine timer callback
2017-06-21 10:13:20 -07:00
Dante Ruiz
f369303bfe removed warning 2017-06-21 18:12:31 +01:00
Brad Hefta-Gaub
c5845787da Merge pull request #10759 from jherico/file_cache_shutdown
Fix crash when cache entry lifetime exceeds cache lifetime
2017-06-21 10:06:48 -07:00
Dante Ruiz
729065749f fixed merge conficts 2017-06-21 16:59:53 +01:00
Sam Cake
09529f6592 One more refinemnt of the comment 2017-06-21 00:54:04 -07:00