2604 commits

Author	SHA1	Message	Date
Stephen Birarda	a21a34a4a4	add entities file replacement to DS and ES	2017-04-27 16:56:27 -07:00
ZappoMan	76902b15d3	remove one last debug log	2017-04-26 18:51:41 -07:00
ZappoMan	c0df82ff69	Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL	2017-04-26 18:49:24 -07:00
ZappoMan	834a447d62	remove debugging code	2017-04-26 18:36:44 -07:00
Ryan Huffman	ac0a738945	Merge pull request #10261 from Atlante45/feat/progressive-load-ktx ... Add progressive load for KTX textures	2017-04-26 18:36:01 -07:00
ZappoMan	1f9e07b828	more logging	2017-04-26 16:40:13 -07:00
ZappoMan	3de92121e0	more logging	2017-04-26 15:28:10 -07:00
anshuman64	5bd9b2e631	Merge pull request #10130 from ctrlaltdavid/21249 ... New avatar record and playback script	2017-04-26 15:18:30 -07:00
ZappoMan	7154a11192	add some more logging	2017-04-26 14:03:36 -07:00
Andrew Meadows	75c2776836	remove keep-alive packet from avatar-mixer	2017-04-26 12:47:27 -07:00
ZappoMan	7840377109	Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL	2017-04-26 12:39:30 -07:00
Andrew Meadows	ac6d4969d6	Merge pull request #10270 from Atlante45/fix/unload ... Fix entity script unloads	2017-04-26 11:42:14 -07:00
Atlante45	043c587395	Fix byte range for file resource requests	2017-04-26 10:49:23 -07:00
Stephen Birarda	3928e11611	fix valid byte range check and send asset from 0	2017-04-26 10:48:57 -07:00
Stephen Birarda	814970c4e2	cleanup invalid byte range handling	2017-04-26 10:48:57 -07:00
Stephen Birarda	7a3219d8f9	force a negative to in ATP byte range to be invalid	2017-04-26 10:48:57 -07:00
Stephen Birarda	06ce63f421	fix byte range set check in SendAssetTask	2017-04-26 10:48:57 -07:00
Stephen Birarda	8145e416f9	check both sides of range for invalid byte range	2017-04-26 10:48:57 -07:00
Stephen Birarda	397a29039e	add support for byte range requests to ATP	2017-04-26 10:48:57 -07:00
David Rowe	4a5f84f4b9	Merge branch 'master' into 21249 ... # Conflicts: # libraries/audio-client/src/AudioClient.cpp	2017-04-26 13:24:18 +12:00
ZappoMan	65801cbb4d	Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL	2017-04-25 18:21:17 -07:00
ZappoMan	90cdeb9582	Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL	2017-04-25 16:09:59 -07:00
ZappoMan	8dc41ca8b9	add support for ignore radius from agent scripts	2017-04-25 15:28:26 -07:00
David Rowe	4c30c0d722	Make UserActivityLogger available to AC scripts	2017-04-25 13:42:12 +12:00
ZappoMan	382645ddd0	more cleanup	2017-04-24 18:01:54 -07:00
ZappoMan	c9aad6b762	new approach to the tpose fix, as well as other improvements	2017-04-24 17:36:05 -07:00
Atlante45	d292451f91	Remove unnecessary const	2017-04-24 15:43:36 -07:00
ZappoMan	088cdae320	CR feedback	2017-04-21 11:14:47 -07:00
ZappoMan	125b3d5f4e	ignore old identity packets	2017-04-21 07:51:17 -07:00
Seth Alves	21ca767b7c	remove setPosition and setRotation for actions because they were never finished and never used.	2017-04-18 11:59:16 -07:00
Seth Alves	d17d12446b	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-14 12:49:03 -07:00
Thijs Wenker	6f58e91d76	Merge pull request #10121 from birarda/bug/recording-cache ... cleanup Agent RSI handling, make loadRecording async	2017-04-14 21:35:51 +02:00
Andrew Meadows	5bdecfbfa0	send keep-alive packets but don't resend identity	2017-04-13 16:00:11 -07:00
Andrew Meadows	14b60165ef	don't keep stale avatars alive	2017-04-13 14:55:08 -07:00
Andrew Meadows	63ea16f24b	avatar-mixer to send identity packets as 'reliable'	2017-04-13 13:37:18 -07:00
Andrew Meadows	e364b8d33e	avatar-mixer resends to avoid stale avatar	2017-04-13 13:35:59 -07:00
Seth Alves	0eb9507a10	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0	2017-04-12 16:25:50 -07:00
Seth Alves	74c0a70cb0	rename base action classes to dynamics, start on constraints	2017-04-11 20:39:13 -07:00
Andrew Meadows	d25c0ace44	AvatarMixer sends min updates for out-of-view avatars	2017-04-11 15:02:27 -07:00
Stephen Birarda	84a5807ff1	return ScriptAvatarData raw pointer from getAvatar	2017-04-10 22:15:45 -07:00
Stephen Birarda	6c49db0f1b	add missing include for qScriptRegisterMetaType in Agent	2017-04-10 22:15:45 -07:00
Stephen Birarda	42a406e90a	add ScriptAvatar for std::shared_ptr<Avatar> passing to scripts	2017-04-10 22:15:45 -07:00
Stephen Birarda	602d65a71a	Merge pull request #10001 from birarda/cleanup-ebp ... cleanup EncodeBitstreamParams to use nodeData when possible	2017-04-10 15:54:30 -07:00
Howard Stearns	54888f85be	strip more	2017-04-10 08:41:50 -07:00
Howard Stearns	c32879d807	fix multi-line sessionDisplayName	2017-04-08 15:41:11 -07:00
Stephen Birarda	c7a28a527a	cleanup Agent recording handling, make loadRecording async	2017-04-04 10:56:25 -07:00
Stephen Birarda	6ed4295b8b	make sure HeadData is present before processing recording frames	2017-04-03 13:55:11 -07:00
Zach Fox	8a96969471	Merge pull request #9873 from highfidelity/PAL_v2 ... PAL v2.0	2017-03-31 17:00:41 -07:00
Howard Stearns	0c07003768	Merge pull request #10049 from AndrewMeadows/avoid-invisible-avatars ... Avoid invisible avatars	2017-03-31 13:48:41 -07:00
David Kelly	e66c075f8e	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-30 10:14:29 -07:00