644 commits

Author	SHA1	Message	Date
Stephen Birarda	ed19987b7d	resolve conflicts on merge with upstream/master	2015-09-04 12:31:46 -06:00
Howard Stearns	d003ec9c58	Delete collision sounds (and their threads) after use. ... This has been broken ever since I added avatar collision sounds around https://github.com/highfidelity/hifi/pull/5159 or so.	2015-08-31 15:49:17 -07:00
Stephen Birarda	80cf7b6c76	resolve conflicts on merge with upstream/master	2015-08-27 14:50:04 -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
Brad Davis	d311e4f2ea	Fixing problems reported by static analysis tool	2015-08-25 19:18:55 -07:00
Brad Davis	380b0cb23c	Removing tabs from our javascript and C++	2015-08-24 15:26:46 -07:00
Brad Davis	8c7711168c	Merge pull request #5603 from sethalves/linux-memory-debugger ... memory debugging on linux	2015-08-20 19:19:24 -07:00
Stephen Birarda	e93b360908	expose options property to AI script interface	2015-08-20 12:12:43 -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	6860f3d126	add readWithoutCopy for clarity in Packet read	2015-08-19 14:32:26 -07:00
Ryan Huffman	5884fcb17b	Merge branch 'ordered-sending' into atp-server	2015-08-19 12:23:31 -07:00
Ryan Huffman	4827d326f4	Update ResourceCache to allow multiple downloads on the same resource	2015-08-19 12:11:47 -07:00
Ryan Huffman	ae93d74d8b	Update Sound to use new ResourceCache	2015-08-03 16:27:34 -07:00
Stephen Birarda	9e7fb9ae16	shuffle Packet headers, use static enum for PacketType	2015-07-23 13:56:47 -07:00
Stephen Birarda	0177513285	resolve conflicts on merge with upstream/master	2015-07-20 12:29:38 -07:00
Stephen Birarda	1fd4a1f0c3	resolve conflicts on merge with upstream master	2015-07-17 16:07:45 -07:00
Stephen Birarda	331bb54144	remove unused variable	2015-07-17 15:59:39 -07:00
Stephen Birarda	39272652e5	fix seeks in InboundAudioStream	2015-07-17 15:59:24 -07:00
Stephen Birarda	0f534b9f7b	fixes for new read and NLPacketList	2015-07-17 15:43:20 -07:00
Howard Stearns	2d277a2abd	Fix https://app.asana.com/0/30233891560551/41734486809354/f	2015-07-17 11:28:25 -07:00
Stephen Birarda	e5722098f6	resolve conflicts on merge with upstream/master	2015-07-17 11:06:01 -07:00
Stephen Birarda	a6641908fb	check if audio mixer is alive before packet send	2015-07-16 15:49:15 -07:00
Stephen Birarda	c5047ec76d	fix sequence number packing for audio injector	2015-07-16 15:47:25 -07:00
Stephen Birarda	333cd77d9c	cleanup call to parseAudioData	2015-07-15 17:20:02 -07:00
Stephen Birarda	9318f464a4	fix position of read in InboundAudioStream	2015-07-15 16:42:58 -07:00
Stephen Birarda	273e92f1fd	pass correct size for audio read	2015-07-15 16:34:00 -07:00
Stephen Birarda	05dde9d8f5	resolve conflicts on merge with upstream/master	2015-07-15 16:18:47 -07:00
Stephen Birarda	52fdce4a44	fix fromRawData call for silent audio packet	2015-07-15 15:41:45 -07:00
Stephen Birarda	e127c5c06d	rename Packet methods for clarity	2015-07-15 10:40:40 -07:00
Atlante45	fbb6a94579	Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol	2015-07-14 16:36:28 -07:00
Stephen Birarda	fbd287472d	make NodeData parseData take only packet	2015-07-14 14:09:00 -07:00
Atlante45	c80df94b06	Update includes for moved files	2015-07-13 15:28:55 -07:00
Stephen Birarda	ede39515d8	update parseData for new network API	2015-07-13 14:26:10 -07:00
Atlante45	957e6394a9	sendPacket function take Node& not a pointer	2015-07-13 11:57:20 -07:00
Atlante45	6c591131ba	Made Animations safe for resource reload	2015-07-10 12:01:51 -07:00
Stephen Birarda	a363f42bb2	pass const NLPacket& for all sendUnreliablePacket calls	2015-07-09 11:42:18 -07:00
Stephen Birarda	f3eb6982e6	fix writing to packet in AudioInjector	2015-07-08 16:39:24 -07:00
Atlante45	7329ad6334	Templated read/write in Packet	2015-07-08 13:45:12 -07:00
Atlante45	6bf05fbf1f	Pointer fixes	2015-07-08 10:50:51 -07:00
Atlante45	7713219718	Compile fixes	2015-07-08 10:40:35 -07:00
Stephen Birarda	74940a2132	replace lingering PacketTypes in old format	2015-07-08 10:18:13 -07:00
Stephen Birarda	eac3a2a640	packet repairs for AudioInjector	2015-07-07 15:50:32 -07:00
Stephen Birarda	ffa6edc904	fix spaces created by xcode find/replace	2015-07-07 15:01:19 -07:00
Stephen Birarda	e1c098233a	use sendUnreliablePacket for repeated send in AI	2015-07-06 18:03:41 -07:00
Stephen Birarda	b3c3e5a6c8	more PacketType to PacketType::Value replacements	2015-07-02 16:49:19 -07:00
Stephen Birarda	0d64e82fe2	replace PacketType declarations with PacketType::Value	2015-07-02 16:38:52 -07:00
Howard Stearns	3b8a46b87d	Allow scripted audio injectors to have options set.	2015-06-23 21:01:34 -07:00
Howard Stearns	b506fe0f1d	Merge branch 'master' of https://github.com/highfidelity/hifi into refactor-playSound	2015-06-19 14:22:04 -07:00