3490 commits

Author	SHA1	Message	Date
Stephen Birarda	8978254037	kick logged in by fingerprint/ip if enabled in DS settings	2017-11-27 18:23:14 -08:00
Brad Hefta-Gaub	ebac2556e4	Merge pull request #11841 from ZappoMan/makeAddEntityAtomic ... Make add entity atomic	2017-11-18 14:27:12 -08:00
Brad Hefta-Gaub	0678a7c9df	Merge pull request #11718 from kencooke/audio-louder-mastergain ... Adjustable master avatar volume	2017-11-17 16:58:27 -08:00
ZappoMan	66454e7288	fix unix warnings	2017-11-17 16:33:43 -08:00
ZappoMan	71a46a3374	cleanup	2017-11-17 13:03:04 -08:00
Stephen Birarda	239b116874	Merge pull request #11835 from birarda/bug/octree-connection-id ... Reset EntityTreeSendThread known state if client disconnects from Entity Server	2017-11-17 12:56:25 -08:00
Stephen Birarda	16d93ee168	clarify signatures in LNL to send packet lists	2017-11-17 11:17:11 -08:00
ZappoMan	cd0fa989e1	debugging	2017-11-17 08:55:55 -08:00
ZappoMan	e438ac54d5	make adds go over NLPacketList as reliable	2017-11-16 13:16:23 -08:00
Stephen Birarda	eedb77dae9	add clearing of known state if client resets ES connection	2017-11-16 11:40:35 -08:00
ZappoMan	4c4f23e312	Merge branch 'master' of https://github.com/highfidelity/hifi into makeAddEntityAtomic	2017-11-16 10:09:46 -08:00
Atlante45	e68ce97697	Remove the number of socket change tracking	2017-11-15 11:19:54 -08:00
ZappoMan	c6947dd165	some side by side plumbing for NLPackets and NLPacketLists	2017-11-09 18:20:06 -08:00
Melissa Brown	a14e98053e	Merge pull request #11138 from Nex-Pro/21466 ... Fix Avatar Rotation upon Teleporting Using PAL	2017-11-03 11:58:15 -07:00
Zach Fox	48979a5ce8	Merge pull request #11730 from zfox23/pop_avatarEntityTests ... Commerce: Avatar Entity Tests	2017-11-02 15:34:37 -07:00
Stephen Birarda	25c10d5de2	Merge pull request #11735 from highfidelity/stable ... Merge stable back into master	2017-11-02 14:22:31 -07:00
Ryan Huffman	edc7b91a42	Fix comment in NetworkingConstants referencing shared.js location	2017-11-01 12:57:07 -07:00
Zach Fox	bb1ffbc06f	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_avatarEntityTests	2017-11-01 12:38:34 -07:00
Ken Cooke	82d9827571	Merge branch 'master' into audio-louder-mastergain	2017-11-01 08:10:55 -07:00
Nissim Hadar	03d2ca19b9	Moving consts into mode::Haze namespace.	2017-10-31 13:46:58 -07:00
Zach Fox	90e9251176	It's a start	2017-10-31 11:28:19 -07:00
Ken Cooke	cfba6ae819	Implement master avatar gain in the audio-mixer	2017-10-31 11:18:03 -07:00
Ken Cooke	6ba2a83bbe	Send and receive Avatar MASTER Gain packets, signaled using null nodeID. ... Packet protocol change is not needed (existing audio-mixer will ignore).	2017-10-29 10:47:56 -07:00
divya	de4fd269ef	Merge pull request #11701 from birarda/bug/local-ds-inconnect ... only respond to expected ICE peers in DS	2017-10-28 21:23:05 -07:00
Zach Fox	5ab737f66d	Merge pull request #11658 from zfox23/pop_dynamicTestsMaster ... Commerce: Owner Verification for Certified Entities	2017-10-27 12:28:04 -07:00
Stephen Birarda	689828e3fa	add packet version change for ICE ping change	2017-10-27 10:00:49 -07:00
Stephen Birarda	10d05ba6c9	only respond to expected ICE peers in DS	2017-10-26 16:34:49 -07:00
Zach Fox	002141724b	Return to using NetworkingConstants	2017-10-26 14:12:36 -07:00
Stephen Birarda	e450ac5bd3	don't use COW-less SpecialAddress assignment	2017-10-25 15:28:30 -07:00
Zach Fox	14150c09ac	Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting	2017-10-25 12:59:36 -07:00
Zach Fox	91333cdf7b	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-25 10:26:50 -07:00
Zach Fox	d7bdbfb37b	Fix unix build errors	2017-10-25 09:53:59 -07:00
ZappoMan	aad91edba2	actually remove all those defines	2017-10-24 14:45:33 -07:00
Zach Fox	b092862b03	Missed another spot	2017-10-24 14:23:06 -07:00
ZappoMan	5901d1a311	clean up VERSION_ENTITIES stuff	2017-10-24 13:48:27 -07:00
Zach Fox	48c8d52c09	Cleanup	2017-10-24 13:30:27 -07:00
ZappoMan	12c32d5834	bump protocol version	2017-10-24 13:08:48 -07:00
Zach Fox	c64c2e17c8	First pass at consolidation	2017-10-24 12:01:05 -07:00
ZappoMan	a1885926b5	some cleanup	2017-10-24 11:46:42 -07:00
ZappoMan	1128a98e88	implement callEntityClientMethod	2017-10-24 11:15:57 -07:00
Zach Fox	cda43ec1ea	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-23 11:52:59 -07:00
ZappoMan	fb7f6df694	CR feedback	2017-10-22 11:40:41 -07:00
ZappoMan	934c9479af	implement support for Entities.callEntityServerMethod()	2017-10-21 20:27:35 -07:00
Zach Fox	0dc6211a7d	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-19 14:43:33 -07:00
Daniela	832e30ad1c	Edited Packet headers.	2017-10-19 19:53:47 +01:00
Zach Fox	9537e19ad4	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-19 10:58:55 -07:00
Zach Fox	3f0b08aea8	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-18 10:37:47 -07:00
Zach Fox	552defb418	Change protocol version	2017-10-16 11:23:34 -07:00
Nissim	0a5302ce25	Merge branch 'master' of https://github.com/highfidelity/hifi	2017-10-16 11:01:13 -07:00
Ryan Huffman	4a9aa30630	Merge pull request #10956 from birarda/feat/update-default-avatar ... update default avatar to be better with oculus grab triggers	2017-10-13 15:57:37 -07:00