56707 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Anthony J. Thibault	e531468ac7	Fix for html url	2017-06-22 13:14:47 -07:00
Seth Alves	4c5090e8ac	Merge branch 'master' of github.com:highfidelity/hifi into fix-linux-asan	2017-06-22 13:11:17 -07:00
howard-stearns	cec4b4e86b	change var to a global per CR	2017-06-22 12:54:30 -07:00
Anthony J. Thibault	3184d4e9d1	Puck attach only shows available tracked objects.	2017-06-22 12:17:22 -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
Anthony J. Thibault	6e10a6fc60	Merge branch 'master' into feature/puck-attach	2017-06-22 11:32:59 -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
Seth Alves	9ce173f682	missed a few	2017-06-22 10:56:08 -07:00
Seth Alves	517bf0af0f	Merge branch 'master' of github.com:highfidelity/hifi into fix-linux-asan	2017-06-22 10:07:44 -07:00
Seth Alves	7ff576ef18	add memory-debugging macro to some cmake files	2017-06-22 10:07:39 -07:00
humbletim	0ef623ba06	* revert button icons and name ... * add new attachmentsUpdated signal and connect to 'doppleganger_attachments' logAction * fix typo in debug mode	2017-06-22 12:45:53 -04: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
Vladyslav Stelmakhovskyi	30714d5d25	Make background with default color. Fix few warnings	2017-06-22 16:47:40 +02: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
Ken Cooke	af0f460659	Fix extra whitespace	2017-06-22 06:38:13 -07:00
Ken Cooke	5d235f8c52	Fix typo	2017-06-22 06:32:32 -07:00
Seth Alves	d2a8300a3f	Merge branch 'master' of github.com:highfidelity/hifi into fix-linux-fbx-lib	2017-06-21 20:31:16 -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	8f51beda17	installer allows /nSandboxIfNew command line switch, which defaults ... sandbox to off if this is a new install	2017-06-21 16:54:47 -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