14032 commits

Author	SHA1	Message	Date
samcake	732c911fd7	Merge pull request #6439 from ZappoMan/assetJS ... add Assets.uploadData() and Assets.downloadData()	2015-11-19 17:56:10 -08:00
Brad Hefta-Gaub	f80a765a29	add Assets.uploadData() and Assets.downloadData()	2015-11-19 17:28:20 -08:00
Brad Davis	e187aaedcb	Load recorded clips from URLs, not file paths	2015-11-19 15:56:37 -08:00
Seth Alves	2938f0d835	Merge pull request #6421 from ZappoMan/outOfOrderDelete ... Possible fix to abandoned lines/entities	2015-11-19 10:26:14 -08:00
Brad Hefta-Gaub	e318537af4	Merge pull request #6425 from birarda/handshake-ds-settings ... fix case where servers could run without settings	2015-11-19 10:10:28 -08:00
Seth Alves	98073de0b8	Merge pull request #6426 from ZappoMan/entitiesFileDownload ... implement support to download the persist file from entity server status page	2015-11-19 09:47:10 -08:00
Brad Hefta-Gaub	45e8ebbe8c	Merge pull request #6432 from huffman/lod-range ... Increase available range in LOD Tools	2015-11-19 09:40:10 -08:00
Ryan Huffman	8adf456b91	Update range of LOD to go up to 20:2	2015-11-19 08:52:57 -08:00
samcake	74beeefe06	Merge pull request #6420 from jherico/dargo ... Make recording and playback work in interface, playback in agent	2015-11-18 17:52:09 -08:00
Brad Hefta-Gaub	456da661ff	implement support to download the persist file from entity server status page	2015-11-18 17:30:07 -08:00
Brad Davis	98cc7408b1	Fixing issues found in AC playback test	2015-11-18 17:17:20 -08:00
Stephen Birarda	08e6b63090	cleanup debug of received domain-server settings	2015-11-18 15:43:31 -08:00
Stephen Birarda	3ba0c9d042	resolve conflicts on merge with upstream master	2015-11-18 15:29:39 -08:00
Stephen Birarda	f2ecce6043	use safer domain settings request in audio-mixer	2015-11-18 15:13:29 -08:00
Stephen Birarda	1a066abb26	fix some indentation for UDT_CONNECTION_DEBUG lines	2015-11-18 14:43:56 -08:00
Brad Davis	fd3599acc5	PR comments	2015-11-18 14:32:56 -08:00
Brad Hefta-Gaub	2f3cf82202	don't apply out of order edits to entities that have been deleted	2015-11-18 14:26:18 -08:00
Stephen Birarda	65142a3963	clean up agent comment for domain settings request	2015-11-18 14:20:56 -08:00
Brad Davis	5b8047ded4	Make recording and playback work in interface, playback in agent	2015-11-18 14:04:45 -08:00
Anthony Thibault	d3d3ddfaf1	Merge pull request #6417 from AndrewMeadows/avatar-capsule ... fix bounding capusule calculations for new avatars	2015-11-18 13:02:48 -08:00
Brad Hefta-Gaub	35677d3a48	Merge pull request #6418 from birarda/test-ds-settings-fail ... move keepalive pings transparently to NL	2015-11-18 11:12:16 -08:00
Andrew Meadows	5c6df734c5	initialize vector of vec3's	2015-11-18 10:47:53 -08:00
Stephen Birarda	c54dffac12	fix entity-server avg ping, remove debug	2015-11-18 10:32:35 -08:00
Andrew Meadows	ae88057ad9	remove dangling whitespace	2015-11-18 10:24:10 -08:00
Stephen Birarda	0e3d3451d7	make keep alive pings the responsibility of NL	2015-11-18 10:24:10 -08:00
Brad Davis	2636e43fab	Merge pull request #6413 from samcake/controllers ... Recording: Moving the Recording js interface to the Script engine	2015-11-18 10:22:55 -08:00
Andrew Meadows	ee751ed1b9	use kDop volume of avatar mesh parts for capsule	2015-11-18 09:22:40 -08:00
Philip Rosedale	5b853ddf57	Merge pull request #6402 from sethalves/grab-equip ... grab script bumper is an equip toggle	2015-11-17 20:15:26 -08:00
Philip Rosedale	450608bf5b	Merge pull request #6390 from sethalves/average-near-holds ... Average near holds	2015-11-17 20:01:46 -08:00
samcake	368f19b4e2	Merging with todays upstream and checking	2015-11-17 18:58:10 -08:00
Brad Hefta-Gaub	ba922290a4	Merge pull request #6407 from jherico/dargo ... Exclude avatar scales out of the permissable range	2015-11-17 18:41:15 -08:00
Brad Hefta-Gaub	733d93039f	Merge pull request #6403 from jherico/rec3 ... Recording fixes	2015-11-17 17:52:15 -08:00
samcake	d2f3b48637	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-11-17 17:36:38 -08:00
Brad Davis	4e57c9114c	Avatar has no dependency on audio or recording anymore	2015-11-17 17:13:53 -08:00
Brad Davis	0ad1d08041	Exclude avatar scales out of the permissable range	2015-11-17 16:46:25 -08:00
Brad Hefta-Gaub	293914b84f	added NodeActivated signal to make it easier for users to know when a recently added node has an active socket	2015-11-17 16:31:34 -08:00
Brad Hefta-Gaub	073215d067	handle socketActivated	2015-11-17 15:55:41 -08:00
Brad Hefta-Gaub	9c4286b6ca	Merge branch 'master' of https://github.com/highfidelity/hifi into messaging	2015-11-17 15:50:54 -08:00
Stephen Birarda	f5ec458a5e	make activeSocket checks more consistent	2015-11-17 15:38:03 -08:00
Stephen Birarda	3906a747b8	fix a couple of bad checks	2015-11-17 15:33:57 -08:00
Brad Davis	48b0465e56	Fixing race condition on seek, correcting some issues with frame timing	2015-11-17 15:18:32 -08:00
Brad Davis	900f425f35	Recording fixes	2015-11-17 15:18:31 -08:00
Stephen Birarda	34b8fca83b	add socketActivated signal to NetworkPeer for punch success	2015-11-17 15:04:31 -08:00
Stephen Birarda	7dfdb3c72e	protect LNL packet sending without active socket	2015-11-17 15:04:14 -08:00
Brad Hefta-Gaub	3efbcb7062	debug the late connect case	2015-11-17 14:47:59 -08:00
Brad Hefta-Gaub	d8a3927311	debug the late connect case	2015-11-17 14:43:06 -08:00
Andrew Meadows	2b07daa976	Merge pull request #6404 from hyperlogic/tony/bugfixes-for-avatars-with-no-eyes ... Bug fixes for avatars with no eyes	2015-11-17 14:29:20 -08:00
Brad Hefta-Gaub	85aa3b3f83	handle subscribe when messages mixer is not available	2015-11-17 14:28:51 -08:00
Brad Hefta-Gaub	8112b3b57e	add senderUUID to the messageReceived signal	2015-11-17 14:16:22 -08:00
Brad Davis	6664d8d919	Merge pull request #6398 from ZappoMan/messaging ... messages-mixer	2015-11-17 14:03:03 -08:00