1117 commits

Author	SHA1	Message	Date
Stephen Birarda	030404157e	cleanup Assignment grab from iterator	2015-09-21 11:54:41 -07:00
Stephen Birarda	e21c1cb67c	make sure server/mixers are first in FIFO	2015-09-21 11:51:53 -07:00
Atlante45	449d6a04d8	CR	2015-09-11 14:21:56 +02:00
Atlante45	0037a1f4a7	Win build fix	2015-09-11 14:21:55 +02:00
Atlante45	18a696d88c	Type cleanup	2015-09-11 14:21:54 +02:00
Atlante45	15f7745bcc	JSON stats reliable and ordered	2015-09-11 14:21:54 +02:00
Atlante45	5808658958	Make NodeJSONStats reliable	2015-09-11 14:21:53 +02:00
Stephen Birarda	e1c395f5ea	resolve conflicts on merge with upstream/master	2015-09-08 14:56:23 -07:00
Rudi Chen	b703ce01fb	Make sure libdl is linked after libcrypto. ... Fixes a `undefined reference to symbol 'dlclose@@GLIBC_2.2.5' error I was running into on Linux Mint 17.2.	2015-09-06 21:42:02 -04:00
Stephen Birarda	ed19987b7d	resolve conflicts on merge with upstream/master	2015-09-04 12:31:46 -06:00
Bennett Goble	6f4fc24fb6	NodeConnectionData QDataStream #include	2015-08-30 12:05:56 -04:00
Stephen Birarda	e3e529c4e5	resolve conflicts on merge with origin/protocol	2015-08-27 14:52:29 -07:00
Stephen Birarda	80cf7b6c76	resolve conflicts on merge with upstream/master	2015-08-27 14:50:04 -07:00
Brad Davis	8cd13cad00	Merge pull request #5661 from sethalves/linux-memory-debugger ... call setup_memory_debugger from common macros rather than from everywhere	2015-08-26 15:43:08 -07:00
Andrew Meadows	0835b79e33	Merge pull request #5646 from birarda/ds-cleanup ... de-bloat the domain-server by adding a gatekeeper	2015-08-26 15:42:43 -07:00
Stephen Birarda	1a019187af	Merge branch 'ds-cleanup' into asset-upload	2015-08-26 15:07:43 -07:00
Stephen Birarda	cd7d0f383b	allow editors who can't be verified in the short term	2015-08-26 15:07:29 -07:00
Stephen Birarda	4039c2e3e0	fix for asset-server naming, deadlock in timeout/wait	2015-08-26 14:27:12 -07:00
Stephen Birarda	352f3543c3	resolve conflicts on merge with ds-cleanup	2015-08-26 13:33:50 -07:00
Stephen Birarda	c8545c8aeb	remove an empty line	2015-08-26 12:37:47 -07:00
Stephen Birarda	dc1f726283	don't assign the asset-server in domain by default	2015-08-26 12:36:48 -07:00
Ryan Huffman	aa7d8678e1	Merge branch 'protocol' of github.com:birarda/hifi into atp-server	2015-08-26 12:26:11 -07:00
Seth Alves	695ffa29c7	call setup_memory_debugger from common macros rather than from every CMakeLists.txt file	2015-08-26 11:09:59 -07:00
Atlante45	179ee73e26	Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol	2015-08-26 16:50:33 +02:00
Ryan Huffman	4e3d0758e5	Remove UNUSED_2	2015-08-25 15:07:07 -07:00
Stephen Birarda	c776f04ab2	don't allow in a user who should have edit but not verified	2015-08-25 14:36:22 -07:00
Stephen Birarda	9940f375ea	repairs for CR comments	2015-08-25 10:02:43 -07:00
Stephen Birarda	17befac262	use fixed width for stats tables	2015-08-24 18:10:21 -07:00
Stephen Birarda	b8ac9aa5eb	update jquery and bootstrap in DS	2015-08-24 18:02:26 -07:00
Stephen Birarda	d02e5b2450	fix a typo in comment in DomainGatekeeper	2015-08-24 15:10:27 -07:00
Stephen Birarda	a9c04e5116	don't allow verified connection without username	2015-08-24 15:01:39 -07:00
Stephen Birarda	c6f1567361	add a debug for refused connection in DomainGatekeeper	2015-08-24 14:58:25 -07:00
Stephen Birarda	fe591f61cc	fix class rename in processConnectRequestPacket	2015-08-24 14:54:48 -07:00
Stephen Birarda	d57c1fc2d5	fix a typo in DomainGatekeeper comment	2015-08-24 14:50:18 -07:00
Stephen Birarda	7591a29c48	add back indentation to STATICALLY_ASSIGNED_NODES	2015-08-24 14:44:24 -07:00
Stephen Birarda	d2acf327dd	fix NodeConnectionData discrepancy on request	2015-08-24 14:43:49 -07:00
Stephen Birarda	e8772277de	de-bloat the domain-server by adding a DomainGatekeeper	2015-08-24 14:19:33 -07:00
Andrew Meadows	0fb2390877	Merge pull request #5604 from birarda/master ... report non-skewed uptime from domain-server	2015-08-21 09:16:21 -07:00
Stephen Birarda	aac15e52bb	add explicit cast to double for uptime	2015-08-20 10:19:34 -07:00
Seth Alves	c25082d86f	use -fsanitize=address in all code rather than just the top-level links	2015-08-20 10:14:16 -07:00
Stephen Birarda	74d6e5ba89	make sure LNL goes down before domain-server	2015-08-20 10:01:12 -07:00
Stephen Birarda	b386a95d08	fix sort for node uptime	2015-08-19 18:31:42 -07:00
Stephen Birarda	2738f65c10	have domain-server report non-skewed uptime	2015-08-19 18:23:11 -07:00
Seth Alves	2056f588e3	if environment variable HIFI_MEMORY_DEBUGGING is defined when cmake is run, enable -fsanitize=address on linux	2015-08-19 18:03:16 -07:00
Stephen Birarda	42a7262707	Merge pull request #5565 from murillodigital/node-version ... DO NOT MERGE - Node versioning	2015-08-19 13:32:48 -07:00
Ryan Huffman	da7c9198c5	Remove superfluous log message	2015-08-19 10:01:40 -07:00
Ryan Huffman	63d0205d1e	Move domain settings retrieval to UDT	2015-08-18 23:11:33 -07:00
Stephen Birarda	0f77ab8611	resolve conflicts on merge with upstream/master	2015-08-18 11:45:55 -07:00
Seth Alves	4a456488a1	remove the option to persist entities as anything other than json.gz files	2015-08-17 14:01:25 -07:00
Leonardo Murillo	b345d75e4d	More cleanup and showing version in ds web gui	2015-08-13 16:44:28 -06:00