30401 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Stephen Birarda	7addd9b205	resolve conflicts on merge with birarda/protocol	2015-08-18 11:56:29 -07:00
Stephen Birarda	f8e2d51154	fix indentation changes in State.h	2015-08-18 11:55:49 -07:00
Stephen Birarda	bbd4a20038	resolve conflicts on merge with birarda/protocol	2015-08-18 11:52:14 -07:00
Stephen Birarda	aa1c36e61a	fix State.h after bad merge	2015-08-18 11:51:23 -07:00
Stephen Birarda	3d09f405ed	fix bad merge for State.h	2015-08-18 11:50:23 -07:00
Stephen Birarda	fd43c48eac	resolve conflicts on merge with birarda/protocol	2015-08-18 11:48:36 -07:00
Stephen Birarda	0f77ab8611	resolve conflicts on merge with upstream/master	2015-08-18 11:45:55 -07:00
Stephen Birarda	1c3543febc	use string style hashing for IPv6 addresses	2015-08-18 11:39:04 -07:00
Stephen Birarda	972cf8cb02	remove the container-profile tool	2015-08-18 11:32:00 -07:00
Stephen Birarda	c6467f7fbc	rename the container-test to container-profile	2015-08-18 11:31:11 -07:00
Stephen Birarda	bf919f105a	add a simple container-test, speed HifiSockAddr hashing	2015-08-18 11:29:07 -07:00
Andrew Meadows	52f212b94c	Merge pull request #5585 from sethalves/always-persist-entities-as-json ... always persist entities as gzipped json	2015-08-18 10:34:26 -07:00
Stephen Birarda	b7d779bb25	put back branching for signed Type	2015-08-18 09:56:00 -07:00
Andrew Meadows	9ee49c3e1e	Merge pull request #5551 from sethalves/quiet-compiler ... Quiet compiler	2015-08-18 09:54:29 -07:00
Stephen Birarda	5c2348cf0d	remove header for commented stats	2015-08-18 09:49:39 -07:00
Stephen Birarda	ffa2070a46	remove commented stats in UDTTest	2015-08-18 09:44:56 -07:00
Stephen Birarda	426a8909e1	wait on the SendQueue thread in Connection	2015-08-18 09:40:13 -07:00
Stephen Birarda	4e540828bd	use mod in place of branching for SequenceNumber	2015-08-18 09:33:22 -07:00
Philip Rosedale	cebc4e4608	Merge pull request #5589 from sethalves/simulations-per-second-readout ... Simulations per second readout	2015-08-18 09:26:53 -07:00
Seth Alves	e29bb9183b	minimize diff	2015-08-18 02:08:21 -07:00
Seth Alves	8435550fe9	only update simRate once per second	2015-08-18 02:05:50 -07:00
Seth Alves	551f0aaba3	show how many times per second Application::idle is called	2015-08-18 01:41:17 -07:00
Brad Hefta-Gaub	51f0ab3d7c	Merge pull request #5588 from jherico/homer ... Fix crash on mouse click	2015-08-18 00:58:06 -07:00
Brad Davis	3cbbb5fb79	Fix crash on mouse click	2015-08-18 00:05:02 -07:00
Brad Hefta-Gaub	8944fe5388	Merge pull request #5586 from jherico/homer ... Add highlighting of keyboard focused items	2015-08-17 17:40:47 -07:00
Brad Davis	cb5f80bf78	Add highlighting of keyboard focused items	2015-08-17 17:11:26 -07:00
Stephen Birarda	f039851f13	remove std namespacing from Connection	2015-08-17 16:57:42 -07:00
Brad Davis	5d65937120	Merge pull request #5583 from ZappoMan/clickToFocusWebEntity ... make web entity focus click based	2015-08-17 16:57:39 -07:00
Philip Rosedale	01108bdf6b	Merge pull request #5573 from howard-stearns/sync-eyes-and-vectors ... Synchronize eye joint and debugging vectors	2015-08-17 16:56:01 -07:00
Stephen Birarda	75e7de3019	remove getConnectionSockAddrs vector move	2015-08-17 16:49:08 -07:00
Stephen Birarda	d9f445d5f6	put custom hashing for UUID in UUIDHasher	2015-08-17 16:45:15 -07:00
Stephen Birarda	abf07dc06d	move hasher for UUID to UUID.h	2015-08-17 16:39:52 -07:00
Stephen Birarda	47d1710208	remove msecTimestampNow that is not used	2015-08-17 16:39:29 -07:00
Stephen Birarda	2ec4d8ff3c	rename return of HifiSockAddr objects for connections	2015-08-17 16:39:12 -07:00
Stephen Birarda	d89c54112d	cleanup indentation in Socket	2015-08-17 16:35:23 -07:00
Stephen Birarda	fe100695f0	rename dest to destination for SendQueue	2015-08-17 16:29:21 -07:00
Stephen Birarda	feddb613e2	add comments, use scoped locker in SendQueue	2015-08-17 16:28:33 -07:00
Stephen Birarda	1c176e55ed	add some comments to PacketTimeWindow	2015-08-17 16:13:14 -07:00
Stephen Birarda	71b2d90c64	clarify comment in LossList header	2015-08-17 16:08:34 -07:00
Stephen Birarda	bc6846e08c	fix a typo in Connection header	2015-08-17 16:07:55 -07:00
Stephen Birarda	8c22627f32	fix a typo in comment	2015-08-17 16:07:29 -07:00
Stephen Birarda	ec82e65aec	comment flow window size changes for light ACK	2015-08-17 16:07:07 -07:00
ZappoMan	ae9ccb79ed	cleanup debugging and dead code	2015-08-17 15:58:51 -07:00
ZappoMan	49cf29ce8f	cleanup debugging and dead code	2015-08-17 15:57:20 -07:00
Stephen Birarda	42b5b37b96	force timeout NAK to fit MTU	2015-08-17 15:47:43 -07:00
Philip Rosedale	31e4878902	Merge pull request #5584 from sethalves/fix-eye-calibration-saving ... re-enabled ctrlaltdavid's eye calibration code	2015-08-17 14:49:44 -07:00
ZappoMan	47b0e2fda6	more hacking on click to focus	2015-08-17 14:02:24 -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
ZappoMan	b7d9dc444b	more work on clicking focus	2015-08-17 13:06:32 -07:00
Seth Alves	1c8030472a	back out the more controversial changes	2015-08-17 12:40:56 -07:00