3551 commits

Author	SHA1	Message	Date
Nissim Hadar	8396997dec	Renamed enum element.	2018-01-10 13:35:57 -08:00
Nissim Hadar	c99a936720	Bumped up protocol version.	2018-01-10 11:45:37 -08:00
Nissim Hadar	7811ddb904	Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance	2018-01-08 15:39:09 -08:00
Nissim Hadar	b2b1807490	Changes per code review.	2018-01-08 15:37:06 -08:00
MiladNazeri	56d4429a8b	Merge pull request #12020 from ctrlaltdavid/21646 ... Window JSDoc	2018-01-08 11:53:34 -08:00
Nissim Hadar	a33f3446f6	Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance	2018-01-08 11:51:13 -08:00
Howard Stearns	724db93389	Merge pull request #12002 from howard-stearns/consistent-goToUser ... Consistent go to user	2018-01-07 11:07:39 -08:00
David Rowe	5463f1ae6b	Merge branch 'master' into 21646	2018-01-05 16:58:58 +13:00
Nissim Hadar	e797a77262	Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance ... # Conflicts: # interface/resources/qml/js/Utils.jsc	2018-01-04 15:58:08 -08:00
Atlante45	294a7ca3c6	Make sure the protocol signature still changes	2018-01-04 13:15:01 -08:00
Atlante45	d4a239731c	Add Unused packet type back for ICE servers	2018-01-04 13:07:02 -08:00
Atlante45	aec5ab5921	CR	2017-12-29 12:46:52 -08:00
Atlante45	28f164d7e5	Remove legacy jurisdiction code	2017-12-29 12:46:52 -08:00
Nissim Hadar	affc5d1b86	Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance	2017-12-24 15:27:32 -08:00
John Conklin II	0dd5bbc2d6	Merge pull request #12057 from birarda/61-1-merge-back ... Merge stable back into master after RC61.1	2017-12-22 16:26:08 -08:00
Stephen Birarda	e3cbfd92a0	Merge remote-tracking branch 'upstream/stable' into 61-1-merge-back	2017-12-22 15:48:04 -08:00
Nissim Hadar	8ee5f642a9	Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance ... # Conflicts: # libraries/networking/src/udt/PacketHeaders.cpp # libraries/networking/src/udt/PacketHeaders.h	2017-12-22 15:41:59 -08:00
Zach Fox	808b9cbc31	Merge pull request #12047 from zfox23/commerce_dataTracking3 ... Commerce Data Tracking: Iteration 3 (Purchases)	2017-12-22 14:31:03 -08:00
Stephen Birarda	d299b9a56c	Merge pull request #12024 from birarda/bug/entity-sequence-skip ... handle sequence number from reliably sent adds in OctreeEditPacketSender	2017-12-22 12:30:27 -08:00
Stephen Birarda	95c7f876bf	manually force OwnershipChallengeFix to avoid StaticCertJsonVersionOne	2017-12-21 18:52:01 -08:00
John Conklin II	5a839ebd93	Merge pull request #12049 from zfox23/RC61.1_commerce_fixEcdsaError1 ... RC61.1: Commerce: Fix some rezzing errors; Fix ECDSA errors	2017-12-21 17:46:32 -08:00
Zach Fox	07a1cf434a	IT'S WORKING!!!	2017-12-21 16:33:47 -08:00
Zach Fox	618e5c9032	Commerce Data Tracking: Iteration 3 (Purchases)	2017-12-21 15:46:01 -08:00
Zach Fox	73eb258e79	IT'S WORKING!!!	2017-12-21 15:17:52 -08:00
Stephen Birarda	31e9f26772	fix use after free of pending message	2017-12-21 11:35:11 -08:00
Nissim Hadar	d4b34b71ad	First version with packet update.	2017-12-20 13:12:07 -08:00
Stephen Birarda	1a6546999a	track reliably sent adds in sent packet history from OEPS	2017-12-19 16:00:55 -08:00
David Rowe	e6c40f4aae	Window JSDoc	2017-12-20 10:16:09 +13:00
howard-stearns	16a58ddf5a	Merge branch 'master' of https://github.com/highfidelity/hifi into consistent-goToUser	2017-12-19 10:48:34 -08:00
Howard Stearns	f8cef6631b	Merge pull request #11995 from birarda/bug/fix-connection-reset ... make udt::Connection live as long as node connection	2017-12-19 09:43:54 -08:00
SamGondelman	90d0e9dc32	bump protocol version	2017-12-18 18:35:15 -08:00
Thijs Wenker	3a55fcfaf5	Merge pull request #12014 from thoys/feat/list-assignment-types ... list assignment types in assignment-client help	2017-12-18 16:55:57 -08:00
Zach Fox	6fc58b713e	Merge pull request #12009 from zfox23/commerce_dataTracking2 ... Commerce: Add Passphrase Auth Status data tracking	2017-12-18 16:26:59 -08:00
Thijs Wenker	1bfb62bd7f	list assignment types in assignment-client help	2017-12-18 15:32:32 -08:00
Zach Fox	e075cd79fb	Add Passphrase Auth Status data tracking	2017-12-18 11:51:12 -08:00
howard-stearns	d730b7b87b	consistent goToUser behavior in PAL, and be able to go to flying user.	2017-12-15 17:00:54 -08:00
Stephen Birarda	a5c951a666	remove tracking of last receiver response from SendQueue	2017-12-14 16:41:20 -08:00
Stephen Birarda	75e56b5daa	make the _lastMessageNumber in Connection default to 0	2017-12-14 16:41:20 -08:00
Stephen Birarda	8a2c31d342	only de-activate the SendQueue when it has nothing to send	2017-12-14 16:41:20 -08:00
Stephen Birarda	cf28fdf188	fix message erase in conn, SendQueue ctor order	2017-12-14 16:41:20 -08:00
Atlante45	34c1c27455	Keep track of message numbers	2017-12-14 16:41:20 -08:00
Atlante45	702d2c34a5	Reset ACK in ctor	2017-12-14 16:41:20 -08:00
Atlante45	b2beeae6b1	Keep connection alive as long as the node is connected	2017-12-14 16:41:20 -08:00
Stephen Birarda	da56d47307	make the _lastMessageNumber in Connection default to 0	2017-12-14 15:30:51 -08:00
Stephen Birarda	8b5e8f8d08	only de-activate the SendQueue when it has nothing to send	2017-12-14 15:30:25 -08:00
Stephen Birarda	7f948586dd	fix message erase in conn, SendQueue ctor order	2017-12-14 12:07:32 -08:00
Zach Fox	af346f2ced	Protocol change	2017-12-14 10:09:10 -08:00
Atlante45	ad547f483d	Keep track of message numbers	2017-12-13 19:25:24 -08:00
Atlante45	44190f16c0	Reset ACK in ctor	2017-12-13 16:55:08 -08:00
Atlante45	3a45907df0	Keep connection alive as long as the node is connected	2017-12-13 14:42:20 -08:00