overte-HifiExperiments

mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-17 19:19:40 +02:00

Author	SHA1	Message	Date
Stephen Birarda	88ea6fa589	call script engine shutdown when assignment stopping	2017-01-19 17:01:35 -08:00
Stephen Birarda	a40c25ddbf	fix repeated send of matching entities	2017-01-19 16:42:14 -08:00
Stephen Birarda	b00435074e	stop script engine when entity server goes away	2017-01-19 16:42:14 -08:00
Atlante45	07da0c5e9c	Fix script loading bug	2017-01-19 15:58:55 -08:00
Atlante45	3203e8c7c2	Use Huffman's version of getEntityScriptDetails	2017-01-19 15:49:40 -08:00
Atlante45	20a82df9a0	Fix scripts not reloading in certain edge cases	2017-01-19 15:48:44 -08:00
Ryan Huffman	9e17f63b8f	Add comment to clarify rez/reztmp check in EntityScriptServer	2017-01-19 15:10:26 -08:00
Ryan Huffman	7ba14a5f09	Fix AssignmentParentFinder.h include	2017-01-19 15:08:47 -08:00
Ryan Huffman	3ac44e3a1c	Add guard against unpermitted requests to the entity script server	2017-01-19 14:34:44 -08:00
Ryan Huffman	7fc946f598	Fix duplicate UUID length constant	2017-01-19 13:31:24 -08:00
Ryan Huffman	cbb55a06a0	Update ScriptEngine to store full running status off entity scripts	2017-01-19 13:27:44 -08:00
Clément Brisset	89d1242925	Merge pull request #10 from huffman/feat/entity-server-script-property Entity script status + reload	2017-01-19 11:19:40 -08:00
Stephen Birarda	746327dc11	whitespace cleanup in OST	2017-01-19 10:43:36 -08:00
Stephen Birarda	33cde412b1	make getJSONParameters thread-safe	2017-01-18 17:49:54 -08:00
Stephen Birarda	916a7325bc	remove debug in EntityScriptServer	2017-01-18 17:49:54 -08:00
Stephen Birarda	a86be14b8c	remove debug in OctreeSendThread	2017-01-18 17:49:54 -08:00
Stephen Birarda	5fbdc94c66	pass usesFrustum down to EntityTreeElement	2017-01-18 17:49:54 -08:00
Stephen Birarda	ed41412d95	fix for unpack of OctreeQuery	2017-01-18 17:49:54 -08:00
Atlante45	6b0b19d36d	Unload all scripts on entity server loss	2017-01-18 17:47:19 -08:00
Atlante45	e94cccf08d	Fix server script preload funcitons	2017-01-18 16:12:41 -08:00
Atlante45	e15bf6bfb4	Automatically query octree	2017-01-18 15:15:29 -08:00
Stephen Birarda	112b119f17	send entities that just stopped matching filter	2017-01-18 14:58:36 -08:00
Stephen Birarda	3556379034	leverage JSON filter changes to OctreeQuery in EntityServer	2017-01-18 14:58:36 -08:00
Stephen Birarda	f9f958aef1	provide direct access to OctreeQuery from OHV	2017-01-18 14:58:36 -08:00
Stephen Birarda	6e6f2c50b8	leverage OctreeQuery enhancements in EntityScriptServer/OHV	2017-01-18 14:58:36 -08:00
Ryan Huffman	8137c59ef7	Add support for sending requests to entity script server	2017-01-18 11:15:29 -08:00
howard-stearns	d9182cd38d	Merge branch 'master' of https://github.com/highfidelity/hifi into minimum-edit-entity-filter	2017-01-18 10:02:27 -08:00
Brad Davis	a593a2116a	Removing magic numbers	2017-01-17 18:15:40 -08:00
Brad Davis	cbc89e77ab	Consume fewer resources in AssetServer when interface is running locally	2017-01-17 18:15:39 -08:00
Atlante45	20b7bb0c54	EntityScriptServer tracks server scripts	2017-01-17 16:41:56 -08:00
Atlante45	97e9bfff36	Remove Viewer API for entity server scripts	2017-01-17 15:40:05 -08:00
Atlante45	ff3f175fb7	Fix typos	2017-01-17 15:39:54 -08:00
Atlante45	1212fefa61	Check for avatar collision in assignment as well	2017-01-17 13:47:45 -08:00
Atlante45	5db37fff95	More entity script server work	2017-01-17 13:47:45 -08:00
Atlante45	529286b2ea	More EntityScriptServer work	2017-01-17 13:47:45 -08:00
Atlante45	163d65d784	Setup basic EntityScriptServer	2017-01-17 13:47:45 -08:00
Zach Fox	246f5fb7f5	Add log; fix whitespace	2017-01-17 11:51:09 -08:00
ZappoMan	6e5e9d3492	more work	2017-01-16 18:28:01 -08:00
Zach Fox	e72c25736e	Cleanup	2017-01-16 15:21:18 -08:00
Zach Fox	e98a40c30e	Does this work?	2017-01-16 14:43:30 -08:00
ZappoMan	c9c311e275	checkpoint for distance joints	2017-01-15 11:47:48 -08:00
howard-stearns	f6446c6806	minimum entity edit filter	2017-01-13 13:18:24 -08:00
Zach Fox	b0b6aeac6c	Ken's feedback	2017-01-13 13:00:03 -08:00
Zach Fox	dcff873cd4	Modify slider function	2017-01-13 12:57:35 -08:00
Zach Fox	8bb200902f	First pass	2017-01-13 12:57:35 -08:00
ZappoMan	8bbfb51419	some cleanup	2017-01-10 08:37:01 -08:00
ZappoMan	636ade9eb7	Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo	2017-01-09 11:29:54 -08:00
Chris Collins	30d5f70e11	Merge pull request #9278 from jherico/cpu_opt_scene More low level optimizations	2017-01-09 10:10:40 -08:00
Brad Hefta-Gaub	ef7b9bfde0	Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo	2017-01-09 10:07:05 -08:00
Zach Fox	afa6d54ac4	Actually fix the behavior...	2017-01-06 14:20:25 -08:00
Zach Fox	dec41f67cc	Fix bugs and generally fix behavior	2017-01-06 13:58:23 -08:00
Brad Hefta-Gaub	251495978c	more work on delta sending	2017-01-05 19:46:19 -08:00
Zach Fox	495925a017	This behavior was harder to change than expected...	2017-01-05 16:58:32 -08:00
Brad Hefta-Gaub	5242375215	Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo	2017-01-05 08:57:10 -08:00
Ken Cooke	719c89e800	Shared implementation of fastLog2f() and fastExp2f() moved to AudioHelpers.h	2017-01-04 20:06:46 -08:00
Brad Hefta-Gaub	acca9dbe87	Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo Conflicts: libraries/networking/src/udt/PacketHeaders.cpp libraries/networking/src/udt/PacketHeaders.h	2017-01-04 18:07:22 -08:00
Zach Fox	899dd21328	Lots of CR feedback	2017-01-03 15:43:30 -08:00
Zach Fox	4a21eaa33f	Cleanup before PR	2016-12-30 15:18:01 -08:00
Zach Fox	10b5b957f2	Ahh...It's beautiful and simple now.	2016-12-29 13:09:40 -08:00
Zach Fox	24eac77115	I'm about to refactor this.	2016-12-29 11:57:51 -08:00
Zach Fox	bb2b48d424	Getting very close.	2016-12-29 11:35:20 -08:00
Zach Fox	af1c67a252	Progress!	2016-12-28 17:23:56 -08:00
Zach Fox	e26d347682	It seems to be working, minus removing from list	2016-12-28 15:15:39 -08:00
Zach Fox	46e8bf5283	First steps, holding off til Howard finishes	2016-12-28 15:12:21 -08:00
Zach Fox	800389cf20	Remove HRS logging	2016-12-28 14:37:19 -08:00
Zach Fox	d3c2ba5199	Fix throttling extra data	2016-12-28 13:39:53 -08:00
Brad Davis	7b90d71205	Fix build	2016-12-28 13:23:05 -08:00
Brad Hefta-Gaub	73bfc069da	more work on only sending changes	2016-12-27 17:19:55 -08:00
David Kelly	4fdc093cfa	Throttle extra avatar data When PAL is open, we send AvatarData for avatars out of view, or those who have ignored us (if we are an admin). For those out of view, we really don't need their info at 45hz, so this is a super simple way to get it less often. Chose 1/10th (4.5 hz) randomly and could be much lower. Just wanted to push this and get the conversation going on how best to do it.	2016-12-27 10:17:40 -08:00
David Kelly	38a3ee4104	Some code review feedback more to come	2016-12-27 10:17:39 -08:00
howard-stearns	a9e781f565	naming consistentcy. No functional changes.	2016-12-27 10:17:39 -08:00
howard-stearns	2f2940b7cc	fixes	2016-12-27 10:14:28 -08:00
Howard Stearns	344272f24a	unignore checkpoint (untested)	2016-12-27 10:14:24 -08:00
howard-stearns	0ad9786f6b	requestsDomainsListData	2016-12-27 10:14:20 -08:00
Brad Hefta-Gaub	82dd9412ab	tweaks, using packed scalar for audio loudness	2016-12-21 17:21:28 -08:00
Brad Hefta-Gaub	2ba4fee44b	CR feedback	2016-12-21 08:26:20 -08:00
Brad Hefta-Gaub	5e65e3991c	CR feedback	2016-12-20 21:03:10 -08:00
Brad Hefta-Gaub	d09afa9454	Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer Conflicts: assignment-client/src/avatars/AvatarMixer.h assignment-client/src/avatars/AvatarMixerClientData.h libraries/avatars/src/AvatarData.cpp libraries/networking/src/udt/PacketHeaders.h	2016-12-20 16:25:12 -08:00
howard-stearns	a45e4da75f	Initialize AvatarMixerClientData with the proper node id (should not be zeros for everyone). Then, in interface, check identity packets for self and make sure they're handled.	2016-12-19 15:22:42 -08:00
howard-stearns	9d9345cb65	Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames	2016-12-19 09:19:14 -08:00
Brad Davis	2d73588361	Fix stat tracker missing in agents	2016-12-16 17:34:00 -08:00
howard-stearns	3adc78fecc	Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames	2016-12-16 14:16:06 -08:00
howard-stearns	49fd4216de	sessionDisplayName set at server and passed to all clients (including oneself)	2016-12-16 14:15:20 -08:00
Ryan Huffman	7bb2755913	Add chrome tracing support	2016-12-16 01:14:01 -08:00
Brad Hefta-Gaub	6d7d3551d9	added some stats to the mixer fixed debug logging, improved timer precision	2016-12-15 18:32:11 -08:00
Brad Hefta-Gaub	8497ad1e29	Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer	2016-12-15 16:42:41 -08:00
Brad Hefta-Gaub	ed19b4b592	remove compression at the per avatar data buffer for now, since it gave no benefit	2016-12-15 14:13:38 -08:00
Seth Alves	26639aac15	Merge pull request #8789 from Atlante45/fix/settings Use JSON for application Settings	2016-12-15 07:00:46 -08:00
Brad Hefta-Gaub	439434b300	fixes	2016-12-14 20:24:52 -08:00
Brad Hefta-Gaub	c8fb467579	send minimum data for out of view avatars	2016-12-14 18:17:11 -08:00
Brad Hefta-Gaub	7189f766a2	more hacking	2016-12-13 20:56:41 -08:00
Brad Hefta-Gaub	a7750501c6	first cut at adding view frustum support to avatar mixer	2016-12-13 18:58:11 -08:00
Brad Hefta-Gaub	92632e72b6	make default avatar mixer send bandwidth 5mbps	2016-12-13 17:04:25 -08:00
Brad Hefta-Gaub	e3bc49c302	drop avatar data rate to 45hz	2016-12-13 16:51:59 -08:00
Zach Fox	7030c7b0a6	Space bubble improvements (#9142 ) * The space bubble around a player's avatar is now visualized. When another avatar enters a player's bubble, The bubble visualization will appear, a soft tone will play, and the "Bubble" HUD button will flash. * The space bubble radius setting has been removed. Space bubble size now scales based on avatar scale. * Space bubble collision detection is now more accurate and reliable. * CTRL + N toggles the bubble. * The "Bubble" HUD button has been moved to the proper location.	2016-12-12 14:22:54 -08:00
Zach Pomerantz	5969c1eb06	ensure all accesses of audio pool num are guarded	2016-12-08 14:12:16 -05:00
Zach Pomerantz	eafbeb6d44	Revert "avoid pessimizing audio slave lock contention" This reverts commit `3508e71753`.	2016-12-08 14:10:00 -05:00
Zach Pomerantz	3508e71753	avoid pessimizing audio slave lock contention	2016-12-08 01:53:25 +00:00
Zach Pomerantz	6e0ad5a7ed	initialize audio threads	2016-12-08 01:52:58 +00:00
Zach Pomerantz	ce9346f524	fix thread cleanup of audio pool	2016-12-07 18:43:02 -05:00
Zach Pomerantz	d2ed3caf02	respect audio thread pool size setting	2016-12-07 13:40:22 -05:00
Zach Pomerantz	c4e435a166	simplify locks in AudioMixerSlavePool	2016-12-07 01:17:34 +00:00
Zach Pomerantz	b2f995d3df	algorithm->nestedEach in LimitedNodeList	2016-12-07 00:03:30 +00:00
Zach Pomerantz	28960681d9	limit audio pool to sane thread count	2016-12-06 23:57:38 +00:00
Zach Pomerantz	259775e163	clarify lock requirement in audio slave pool	2016-12-06 23:56:11 +00:00
Zach Pomerantz	2fc904b990	fix typos	2016-12-06 23:54:13 +00:00
Zach Pomerantz	557ab43f0f	add a timeout for errant audio slave threads	2016-12-06 23:53:16 +00:00
Zach Pomerantz	132e9bd644	add timings to AudioMixer	2016-12-06 23:51:06 +00:00
Zach Pomerantz	2a6e46aa0c	rm static buffer from AudioMixerSlave	2016-12-06 20:15:39 +00:00
Zach Pomerantz	d899391a1a	fix audio hist array initializer for WIN32	2016-12-02 04:12:44 +00:00
Zach Pomerantz	800744a139	fix audio pool shutdown and add single threading	2016-12-01 23:03:37 +00:00
Zach Pomerantz	78bc5cf502	fix audio pool resizing	2016-12-01 21:25:56 +00:00
Zach Pomerantz	2c42bb0aa8	time audio mixing frames	2016-11-30 18:18:36 -05:00
Zach Pomerantz	8a6dcdeb68	mix audio with single node list read lock	2016-11-30 16:37:34 -05:00
Zach Pomerantz	b4638105e3	expose audio mixer threads to gui	2016-11-29 13:32:10 -05:00
Zach Pomerantz	7a440def87	add AudioMixerSlavePool	2016-11-28 17:59:29 -05:00
Zach Pomerantz	41ef105456	clean up AudioMixerSlave	2016-11-28 17:07:24 -05:00
Zach Pomerantz	bf137cd589	break AudioMixer slave/stats into own files	2016-11-28 16:50:47 -05:00
Zach Pomerantz	2e619b230d	add AudioMixerStats	2016-11-28 16:50:42 -05:00
Zach Pomerantz	192f4791d5	move mixing into AudioMixerSlave	2016-11-28 16:50:26 -05:00
Zach Pomerantz	891084e9db	modularize audio mixing code	2016-11-28 16:48:53 -05:00
Zach Pomerantz	028ac5264f	consolidate AudioMixer slots	2016-11-28 16:26:53 -05:00
Zach Pomerantz	0170379d3c	rm unused vars	2016-11-27 18:09:05 -05:00
Atlante45	3035d43772	Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings	2016-11-21 13:05:08 -08:00
Brad Hefta-Gaub	fe709f51de	personal space feature	2016-11-19 16:30:15 -08:00
Stephen Birarda	dadcaa9959	don't send audio/avatar data for ignoree to ignored node	2016-11-14 10:12:36 -08:00
Chris Collins	6581a51bc9	Merge pull request #9052 from davidkelly/dk/2226 Add ability to mute user	2016-11-11 16:02:08 -08:00
David Kelly	6063a63f44	cr feedback	2016-11-11 14:23:59 -08:00
David Kelly	9c8f22e0e7	straight to audio mixer since we can get the canKick there too. (doh)	2016-11-11 09:30:58 -08:00
Seth Alves	5629db9109	Merge pull request #9049 from birarda/max-min-av-scale add a min/max avatar scale in domain-server settings	2016-11-11 06:11:02 -08:00
David Kelly	80d4033767	oops forgot one thing...	2016-11-10 17:13:50 -08:00
Stephen Birarda	020942c826	better handling for a flipped min/max scale	2016-11-10 16:50:36 -08:00
David Kelly	285520dff7	Initial cut No script work yet, just first stab at underpinnings	2016-11-10 16:24:35 -08:00
Stephen Birarda	88c63332de	protect flipped min/max scale in avatar mixer settings	2016-11-10 16:21:48 -08:00
Stephen Birarda	64d9fa0f39	clamp avatar scale to domain limit in avatar mixer	2016-11-10 14:19:32 -08:00
Stephen Birarda	77ede81fc9	limit MyAvatar scale to limits from domain settings	2016-11-10 13:27:13 -08:00
Brad Hefta-Gaub	af2f6e831a	Merge pull request #9044 from birarda/higher-mute-permissions elevate permissions required for mute environment to kick	2016-11-10 10:18:06 -08:00
Stephen Birarda	f56a5d1d98	elevate permissions required for mute environment	2016-11-10 09:23:01 -08:00
Brad Hefta-Gaub	8758e4a9ba	add support for whitelist entity scripts	2016-11-09 19:17:24 -08:00
Seth Alves	c8a654a915	Merge pull request #9006 from Atlante45/logging Logging improvements	2016-11-07 13:35:13 -08:00
Atlante45	ae29fe8ab2	Logging improvements	2016-11-04 14:26:19 -07:00
David Kelly	21d1f40f59	Seems we were not deleting the right hrtfs when a node is killed Simple fix, just make sure we delete the hrtfs associated with the killedNode. The test is to delete some nodes (agents) and make sure nothing bad happens to audio mixer, or the audio itself.	2016-11-04 13:15:02 -07:00
David Kelly	920cd90afa	CR feedback	2016-11-03 13:23:05 -07:00
David Kelly	ec0382daf7	PR feedback Completely deleting hrtfs incorrectly. This seems to be better, we only want to delete HRTF for the QUuid() stream for the killed node in each node's list of HRTFs.	2016-11-01 18:29:31 -07:00
David Kelly	c1feac971b	CR feedback	2016-11-01 15:17:07 -07:00
David Kelly	0b80610e65	Needed to properly remove hrtfs for avatar audio	2016-11-01 15:09:14 -07:00
David Kelly	404c08b0c7	Un-do of previous commit Seems to add an artifact when using our test scripts. Will work on that as a separate issue, as it would be an existing issue in any case.	2016-11-01 10:46:22 -07:00
David Kelly	fb2968a419	Reset bytes sent counter when setting avatar sound It could be past the end of the buffer if you changed sounds, and the new one is shorter. Won't happen with our current tests, but that could change, and in general no reason it couldn't happen.	2016-11-01 09:12:35 -07:00
David Kelly	5714063eff	Make more reliable Need to be sure we don't change the _isAvatar or _isListeningToAudioStream from one thread while processing audio in another. Also, fixed issue sending NLPacketList.	2016-10-31 16:38:01 -07:00
David Kelly	e63e9bc017	Remove HRTFs for Avatar too Turns out there was already a function for that, if you just call removeHRTFForStream without a 2nd param, it appears to just delete the audio with uuid of QUuid() which is the avatar's mic. That is what we want, so cool.	2016-10-31 13:25:22 -07:00
David Kelly	80e38c395e	Send KillAvatar to AudioMixer too So it can remove the listening agent avatar audio streams. Otherwise they stick around forever, and eventually swamp the audio mixer.	2016-10-31 10:35:16 -07:00
David Kelly	e3a22618d1	CR feedback	2016-10-27 17:49:43 -07:00
David Kelly	52a14bf5c3	Merge branch 'master' of github.com:highfidelity/hifi into dk/moreACAudioArtifacts	2016-10-27 16:52:25 -07:00
David Kelly	292dd67433	cleanup	2016-10-27 16:04:30 -07:00
Howard Stearns	d2b83b47ba	Merge pull request #8936 from zzmp/clean/audio-mixer clean audio mixer	2016-10-27 15:57:16 -07:00
David Kelly	5e4f539144	AudioMixer flushes now And protected agent from case with no codec	2016-10-27 14:46:04 -07:00
Zach Pomerantz	a7d54b8e0a	rm unused lastCutoffRatio	2016-10-27 14:38:17 -07:00
Zach Pomerantz	c14a928db5	convert size_t to int	2016-10-27 14:34:10 -07:00
David Kelly	d00a73dde1	Play the flushed encoder sound at end Basically 0-padding the end of the sound buffer. Next do that in AudioMixer and we should be good.	2016-10-27 14:27:15 -07:00
Zach Pomerantz	32040a9047	add stat for streams in audio mixer	2016-10-27 13:55:17 -07:00
Zach Pomerantz	68f05bee87	fix underflow for agent audio timer	2016-10-27 13:47:22 -07:00
Zach Pomerantz	20bac5aeef	clean up broadcastMixes	2016-10-27 13:47:00 -07:00
Zach Pomerantz	9e9f8666ce	clean up handleMismatchAudioFormat comment	2016-10-27 13:46:53 -07:00
Zach Pomerantz	04e5d8e302	initialize audio client data	2016-10-27 13:46:42 -07:00
Zach Pomerantz	3e16dabb75	fix audio mixer throttling	2016-10-27 13:46:33 -07:00
David Kelly	6a61762659	First try AudioMixer has same issue transitioning from silence to encoded audio and back, it seems. This makes that go away, but I don't like it. Better to support a flush function in the encoder but for now lets do this and be sure it is the entire issue.	2016-10-26 17:41:34 -07:00
David Kelly	b09364c288	whitespace	2016-10-25 12:22:26 -07:00
David Kelly	30d8f1967c	Flushing encoder Seems they have some state. So if you play a sound, then silence that doesn't go through the encoder (SilentAudioFrame), then a sound again, you will hear a click. Now, I just pop a frame of 0s through the encoder at the end of each .wav it plays. Poof!	2016-10-25 12:15:48 -07:00
David Kelly	86e01bbae6	First cut Started with the horrible screaming when avatar goes away, seems due to not putting a codec string in the packets. This was an existing issue, not due to recent changes. Also, some weird indenting was fixed, etc... Still hear an artifact when audio starts, but only when a codec was negotiated. Hoping to fix that too.	2016-10-24 15:18:29 -07:00
David Kelly	bdcb58bf8b	Merge pull request #8847 from sethalves/fix-audio-mixer-data-race-1 fix some data-races in logging system	2016-10-21 15:33:40 -07:00
Seth Alves	5660063702	code review	2016-10-21 11:05:50 -07:00
Seth Alves	5af8dfdfbd	move ScriptEngines to Agent	2016-10-21 10:57:58 -07:00
Seth Alves	30f29d1796	move ScriptEngines to Agent	2016-10-21 10:57:22 -07:00
Seth Alves	e988941d14	undo bad script-engine AC change	2016-10-21 10:53:13 -07:00
Clément Brisset	b63eb6ba9f	Merge pull request #8665 from zzmp/feat/audio-stats move audio stats to QML/JS, with graphs	2016-10-20 16:43:49 -07:00
Seth Alves	8ac799ddaf	Merge branch 'master' of github.com:highfidelity/hifi into fix-audio-mixer-data-race-1	2016-10-20 10:02:58 -07:00
Chris Collins	98e7d6d0eb	Merge pull request #8843 from sethalves/fix-audio-mixer-data-race-0 Fix some audio mixer data races	2016-10-20 10:01:26 -07:00
Stephen Birarda	eb8f67b612	cleanup asset file regex, comment in renameMapping	2016-10-19 11:47:57 -07:00
Stephen Birarda	7aac2e6916	restrict asset file mapping operations to file path	2016-10-19 10:57:23 -07:00
Seth Alves	af5be8d1d9	reduce data-races in logging	2016-10-18 15:59:00 -07:00
Seth Alves	9cb4756fce	only ScriptEngines for agent ACs	2016-10-18 13:57:30 -07:00
Seth Alves	0c6dedff45	avoid various data-races related to stats collection and delivery	2016-10-18 13:05:53 -07:00
Seth Alves	1203aae96b	don't create ScriptEngines for ACs that don't need them	2016-10-18 10:29:09 -07:00
howard-stearns	055e2ffcb0	Merge branch 'master' of https://github.com/highfidelity/hifi into crowd-animation	2016-10-12 14:38:07 -07:00
Atlante45	36bd9ef4e6	Update new ACClientApp code	2016-10-12 14:02:05 -07:00
David Kelly	c8850a8b8e	PR feedback AgentAvatarTimer now in its own files. The thread still is created the same way, and started only when you are an avatar, but now I remember to stop it when you no longer are one. Audio is still at 100Hz, but avatar messages go at 60Hz as before. Unsure it matters, but easy to do. Looking at that buzz now.	2016-10-12 12:44:24 -07:00
Atlante45	eaca3b672f	Switch to JSON for application settings	2016-10-12 10:20:19 -07:00
howard-stearns	884d22a59b	make agent avatar animations work again, and use them in crowds	2016-10-11 16:06:55 -07:00
David Kelly	1fb7b42f0b	One more comment removed	2016-10-11 09:37:42 -07:00
David Kelly	ef844cbd00	Cleanup artifacts Seems playAvatarSound could be called from a thread other than the Agent's thread. So, artifacts happen when that pointer changes while a 'tick' is happening. Also cleaned up code a bit, got rid of some hard-coded stuff I had in just for dev purposes.	2016-10-11 09:33:55 -07:00
David Kelly	fa9c3951c7	Merge branch 'master' into dk/codecInAgentAvatar	2016-10-10 19:51:56 -07:00
David Kelly	b58c36cb12	Rolling my own 100hz timer Starting with the simplest possible thing - just sleep for 10000 microseconds. Can make it adaptive if need be.	2016-10-10 17:57:04 -07:00
David Kelly	b4c064a538	Hack in a 100hz timer sounds crappy, more to do, just push to not lose anything. <squash this>	2016-10-07 13:20:08 -07:00
David Kelly	ab6ccac631	Merge pull request #8741 from howard-stearns/kill-agents kill agents in avatar mixer when they stop being avatars	2016-10-07 09:16:49 -07:00
David Kelly	95aa18f66d	Some cleanup unnecessary stuff removed, added some cleanup code.	2016-10-06 16:18:22 -07:00
Chris Collins	8310a9fe8a	Merge pull request #8730 from huffman/feat/script-req-retry Add retrying of script requests	2016-10-06 16:09:04 -07:00
David Kelly	a0c731a0c6	Initial attempt Kinda works, but sounds 'scratchy'. Surely I've done something lame.	2016-10-06 14:57:40 -07:00
howard-stearns	dc7a9f253c	kill agents in avatar mixer when they stop being avatars	2016-10-05 13:06:11 -07:00
Zach Pomerantz	5af95c6062	store channels on audio stream	2016-10-05 12:04:24 -07:00
Ryan Huffman	9dfa3e4a17	Move ScriptCache from AssignmentClient to Agent	2016-10-04 16:43:14 -07:00
Ryan Huffman	ae507c4609	Add ScriptCache to assignment clients	2016-10-04 16:43:14 -07:00
Clément Brisset	becee3bba3	Merge pull request #8685 from thoys/ac-fixes Assignment Client fixes	2016-09-30 11:05:58 -07:00
Zach Pomerantz	43c40aa090	avoid repetition with fade on injectors	2016-09-29 15:25:41 -07:00
Thijs Wenker	7e3073e163	fix spelling bugs	2016-09-29 22:13:27 +02:00
Zach Pomerantz	055fabf57b	fix audio AppendFlag semantics	2016-09-26 18:51:51 -07:00
Zach Pomerantz	d3132d8746	denote terminal audio stats packet	2016-09-26 16:50:51 -07:00
Zach Pomerantz	b9c4018b8e	expose AudioStats to qml/js	2016-09-26 15:35:29 -07:00
Zach Pomerantz	a9318d052b	Merge branch 'master' of github.com:highfidelity/hifi into clean/audio-config	2016-09-23 13:11:52 -07:00
Brad Davis	09a218b9fd	Fix build after moving network function	2016-09-23 12:05:04 -07:00
Zach Pomerantz	562e8e0c65	disable excessive audio settings logging	2016-09-23 11:58:02 -07:00
Zach Pomerantz	e2ff738fc3	strip unused audio settings - remove parameters on the jitter buffer algorithm, these are now static - remove parameters on the output starve detection algorithm, now static - move interface audio settings to the Developer menu	2016-09-21 17:35:27 -07:00
Zach Pomerantz	177466e4c7	calculate unplayed ms on all streams/buffers as max	2016-09-15 17:54:41 -07:00
SamGondelman	544606bccc	cmake fix	2016-09-06 17:40:44 -07:00
SamGondelman	74e5814a48	try to fix rpath issue	2016-09-06 17:40:43 -07:00
Seth Alves	b7da72cc46	try again on fix for ACs seeing other avatars	2016-09-02 16:06:51 -07:00
Seth Alves	b6ef6fec73	Revert "fill in linked node data for avatar identity packets, also"	2016-09-02 15:43:25 -07:00
Seth Alves	014190a1bf	fill in linked node data for avatar identity packets, also	2016-09-02 13:52:37 -07:00
Brad Hefta-Gaub	376756d413	include the codec name in the agent avatar audio stream	2016-08-25 09:58:36 -07:00
Seth Alves	9bcda1bb45	merge from upstream	2016-08-20 15:25:04 -07:00
Seth Alves	87dbfa7e47	add -Wsuggest-override to compile flags and deal with fallout	2016-08-18 09:51:41 -07:00
Ryan Huffman	727d59ab27	Add backup directory setting to domain server	2016-08-16 17:33:32 -07:00
Brad Hefta-Gaub	7cbc0bcabe	Merge pull request #8366 from kencooke/master optimized distance-attnuation calculation	2016-08-05 16:45:35 -07:00
Ken Cooke	7629e34586	optimized distance-attnuation calculation	2016-08-04 11:05:34 -07:00
Brad Hefta-Gaub	ca3a194454	implment coded renegotiation in client if for some reason unexpected audio codecs come in to inbound stream	2016-08-02 15:30:03 -07:00
Brad Hefta-Gaub	c6ffd81c4b	some cleanup	2016-07-18 22:42:38 -07:00
Brad Hefta-Gaub	2e63aba8c9	when getting unexpected codec in the mixer, send a message to the client to select a different codec	2016-07-18 22:29:05 -07:00
Brad Hefta-Gaub	20824f038c	include codec in audio stream packets so that each side can discard packets that don't match	2016-07-18 21:59:44 -07:00
Brad Hefta-Gaub	dc2741950a	Merge pull request #8259 from kencooke/improved-hrtf Fix the AudioMixer distance attenuation.	2016-07-15 22:36:51 -07:00
Ken Cooke	59ac2a789f	Fix the AudioMixer distance attenuation. The zone settings are still used, and still match the documentation where 0 = no attenuation and 1 = max attenuation. The default is now 0.5 which corresponds to -6dB per doubling of distance. This is the attenuation for a spherical wave in the free field.	2016-07-15 18:07:19 -07:00
Brad Davis	846c2457a3	Merge pull request #8236 from huffman/fix/atp-reliable Update all asset server responses to be reliable	2016-07-15 10:33:11 -07:00
Ken Cooke	7a4bdc1779	enable in Interface and AudioMixer, by passing distance between source and listener	2016-07-14 11:30:55 -07:00
Ken Cooke	d7399f5781	Improved HRTF. Adds a distance filter to model the frequency-dependent attenuation of sound propagation in open air. Optimized using SIMD and computing all biquads in parallel. Performance impact is almost zero. Filter updates are continuously interpolated and clean to -90dB. Not enabled yet (distance hardcoded to 0.0f)	2016-07-14 10:34:42 -07:00
Stephen Birarda	b68958317a	re-send ignore requests when mixers are re-added	2016-07-13 15:06:31 -07:00
Stephen Birarda	6b6513d5f9	immediately fade out ignored avatars	2016-07-13 15:06:31 -07:00
Stephen Birarda	095bd7e6c8	cleanup logging, move packet parsing to mixers	2016-07-13 15:06:31 -07:00
Stephen Birarda	a134ac72de	add packet type and plumbing for node ignore	2016-07-13 15:06:31 -07:00
Ryan Huffman	b4b7b7ea34	Update all asset server responses to be reliable	2016-07-13 13:41:45 -07:00
Brad Hefta-Gaub	6d7c8d5759	fix crash in audio-mixer if no plugins installed	2016-07-12 16:11:43 -07:00
Brad Hefta-Gaub	71b6210c4e	removed some log spam	2016-07-12 10:18:37 -07:00
Brad Hefta-Gaub	7d608ba592	groundwork for injector support	2016-07-10 21:01:20 -07:00
Brad Hefta-Gaub	ed9715ae5f	some cleanup, proper memory allocation/deallocation	2016-07-10 17:40:58 -07:00
Brad Hefta-Gaub	ba6bb24595	rework plugins to allow different decoder/encoder instances per streams	2016-07-10 16:49:03 -07:00
Brad Hefta-Gaub	a71baf5601	handle codec prioritization, handle multiple codec choices	2016-07-08 21:18:03 -07:00
Brad Hefta-Gaub	126e5c2926	codec pipeline working, zlib example	2016-07-08 14:34:44 -07:00
Brad Hefta-Gaub	3c6447326e	more codec plumbing	2016-07-07 21:24:24 -07:00
Brad Hefta-Gaub	7a4b11ee97	more work on codecs	2016-06-27 13:06:19 -07:00
Brad Hefta-Gaub	d7bffc3eab	first cut at negotiating codecs	2016-06-23 17:14:41 -07:00
Seth Alves	bade215907	maximum 'tmp' entity lifetime is now a domain-server setting, defaults to 1 hour	2016-06-09 10:41:30 -07:00
Seth Alves	b2f63a2132	hook up can-rez-tmp and can-write-to-asset-server	2016-06-07 16:17:58 -07:00
Seth Alves	fc92268641	Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid	2016-06-02 15:38:24 -07:00
Seth Alves	83f2c723eb	collect permissions into their own data structure	2016-06-02 13:15:30 -07:00
Brad Hefta-Gaub	f65f99a3e0	fix warning	2016-05-29 12:34:57 -07:00
Brad Hefta-Gaub	7fd531541c	simplify	2016-05-29 12:08:10 -07:00
Brad Hefta-Gaub	1e7cd06d0e	add audio peak limiter to audio mixer	2016-05-28 20:34:27 -07:00
Brad Hefta-Gaub	06cb625d09	Merge pull request #7959 from hyperlogic/tony/improved-avatar-mixer-precision Improved Avatar Mixer Rotation Precision	2016-05-25 17:14:12 -07:00
Anthony J. Thibault	a1c32f8c44	Merge branch 'master' into tony/improved-avatar-mixer-precision	2016-05-23 10:24:52 -07:00
Seth Alves	d7142aee80	try to make osx clang happy, also	2016-05-21 18:06:21 -07:00
Seth Alves	40e862cf9e	quiet gcc 5 warnings	2016-05-21 16:53:01 -07:00
Atlante45	8be6bc6460	Add missing overrides	2016-05-19 22:00:22 -07:00
Ryan Huffman	dd093e3fcd	Make AccountManager a DependencyManager singleton	2016-05-18 15:38:54 -07:00
Anthony J. Thibault	c48fce4f5a	WIP commit, socket errors when AvatarIdentity is larger then MTU	2016-05-18 15:24:10 -07:00
Anthony J. Thibault	dc6e1afae6	Changed empty AvatarIdentity packet to AvatarData packet Just in-case it actually gets through, it will fail to be parsed by AvatarData::parseDataFromBuffer() due to it's size. AvatarData::hasIdentityChangedAfterParsing() has no such checks.	2016-05-17 16:34:30 -07:00
Anthony J. Thibault	b82356a249	AvatarMixer: Clients will show incompatible version dialog For this to work, the server needs to send an empty AvatarIdentity packet back to the sender when it receives a packet mismatch error. This AvatarIdentity packet will be different then what the client expects and will trigger the incompatible version dialog. Previously, the avatar-mixer was just silently dropping incoming mismatched version packets. Causing the client to never get a response, and thus never showing the incompatible version dialog.	2016-05-17 15:02:04 -07:00
Stephen Birarda	aa226739d3	remove billboard code from Agent	2016-05-12 16:41:44 -07:00
Brad Hefta-Gaub	350743454b	Merge pull request #7839 from sethalves/entity-simulation-smart-pointers-1 use smart pointers for entity simulations	2016-05-10 11:35:57 -07:00
Brad Hefta-Gaub	d7eee98acc	Merge pull request #7827 from AndrewMeadows/threadsafe-viewfrustum resurrection of threadsafe ViewFrustum	2016-05-10 09:06:38 -07:00
Seth Alves	b761ecf44f	merge from upstream	2016-05-10 08:18:45 -07:00
Andrew Meadows	db9a4d6b8f	cleanup for code review	2016-05-10 07:49:11 -07:00
Brad Hefta-Gaub	0de721e8f4	Merge pull request #7838 from zzmp/refactor/script-sleep Use sleep_until for ScriptEngine	2016-05-09 15:58:22 -07:00
Seth Alves	a0771f8ee5	use smart pointers for entity simulations	2016-05-07 09:14:33 -07:00
Zach Pomerantz	173d2a590c	Use sleep_until for ScriptEngine	2016-05-06 19:30:37 -07:00
Brad Hefta-Gaub	99d35c37db	switch OctreeSendThread to use std::this_thread::sleep_for() instead of usleep()	2016-05-06 10:42:07 -07:00
Andrew Meadows	71b2d647e8	add locks and explicitly copy ViewFrustums	2016-05-05 18:28:27 -07:00
Andrew Meadows	bcf2cc8074	use references not pointers for ViewFrustums also unravelling some spaghetti: (1) split Octree stuff out of ViewFrustum (2) moved ViewFrustum from octree to shared lib (3) removed some cruft	2016-05-05 18:28:27 -07:00
Brad Hefta-Gaub	e8af41c6ab	more CR feedback	2016-04-21 15:54:51 -07:00
Brad Hefta-Gaub	31f9d592e0	support for larger than 35 minute clock skew	2016-04-20 18:42:00 -07:00
Stephen Birarda	93cf5a1035	fixes for CR comments	2016-04-18 16:53:02 -07:00
Stephen Birarda	1d256be7ee	fix random stats sending for AudioMixer clients	2016-04-18 16:04:20 -07:00
Stephen Birarda	33b46bd8e3	remove the billboard packet handling from AM	2016-04-18 16:02:46 -07:00
Stephen Birarda	38481aac53	use HRC clock timings in avatar mixer	2016-04-15 11:36:07 -07:00
Stephen Birarda	925c1ce26b	don't send all stats to audio-mixer clients at same time	2016-04-15 11:04:56 -07:00
Stephen Birarda	0fd32b36ad	use a steadier clock for AudioMixer block timing	2016-04-15 11:04:35 -07:00
Stephen Birarda	d7450b8178	release pending ATP script request for active AssetServer	2016-04-13 14:25:23 -07:00
Seth Alves	0980ab5c2d	Merge pull request #7634 from birarda/asset-server-clean cleanup unmapped asset server files	2016-04-12 11:59:41 -07:00
Stephen Birarda	76af3efe73	fix for active socket check on ATP script download	2016-04-11 17:59:27 -07:00
Stephen Birarda	190d11e0bf	rename the set of hashes to check for deletion	2016-04-11 17:16:52 -07:00
Stephen Birarda	026f58c866	don't perform asset cleanup if mapping file load fails	2016-04-11 17:14:31 -07:00
Stephen Birarda	334dc3cb6c	cleanup left file debug, add check for deleted mapping	2016-04-11 09:05:11 -07:00
Stephen Birarda	775898893b	add deletion of unmapped files during delete op	2016-04-11 08:57:07 -07:00
Stephen Birarda	fae9b061a3	promote a debug to info	2016-04-11 08:42:52 -07:00
Stephen Birarda	4d0976f730	remove migration code for pre-mapping migrations	2016-04-11 08:41:42 -07:00
Stephen Birarda	bf3324fc6b	hold download of ATP script if Asset Server isn't ready	2016-04-08 15:28:12 -07:00
Stephen Birarda	1df0dce971	use ResourceRequest in Agent to handle ATP scripts	2016-04-08 14:38:26 -07:00
Brad Hefta-Gaub	40e53baa79	Merge pull request #7597 from Atlante45/fix/script-sound-hold-strong-ref Fix audio injectors not working	2016-04-06 16:57:29 -07:00
Atlante45	6d1b7f1d37	Wrap sound script object to hold a strong ref	2016-04-06 13:04:18 -07:00
Ryan Huffman	29c287227c	Fix AssignmentClient unpacking an assignment when it already has one	2016-04-05 15:30:53 -07:00
Seth Alves	6025a66fa1	Merge pull request #7532 from Atlante45/feat/delayed-decrease Delay congestion epochs first decrease	2016-04-01 18:07:43 -07:00
Atlante45	86b425143b	Use Mbps for max bandwith	2016-03-31 11:03:06 -07:00
Stephen Birarda	882a0272c0	add simple cleanup of unmapped assets on start	2016-03-31 09:54:30 -07:00
howard-stearns	c6347eb92a	checkpoint for debugging/comparing edit.js	2016-03-28 13:39:43 -07:00
Ken Cooke	063891d65e	remove dead code	2016-03-24 13:29:57 -07:00
Ken Cooke	c6ca984782	Fix Reverb Zone settings to work correctly with new reverb.	2016-03-24 12:59:52 -07:00
Brad Hefta-Gaub	8c290ea6b9	Merge pull request #7390 from Atlante45/feat/udp-flood-protection Server side bandwidth dial	2016-03-23 11:47:41 -07:00
Atlante45	d5f6ca5e1c	Add max bandwidth setting	2016-03-21 14:50:18 -07:00
Brad Hefta-Gaub	492e71345a	Revert "Revert "Fix ModelBlender crash"" This reverts commit `f274cdcc7f`.	2016-03-21 11:42:25 -07:00
Brad Hefta-Gaub	f274cdcc7f	Revert "Fix ModelBlender crash"	2016-03-21 10:47:31 -07:00
Brad Hefta-Gaub	7483b8546b	remove FaceModel, make Model support shared_from_this() so we can ave shared and weak pointers to it	2016-03-17 17:05:35 -07:00
Stephen Birarda	92b287355c	make TRUNCATED_HASH_NUM_CHAR a non-static const	2016-03-15 15:56:13 -07:00
Stephen Birarda	b13dff1c77	Revert "remove redundant static from const in AssetServer" This reverts commit 0837261d403e844f648f4f4ddcce7d7b79c7083b.	2016-03-15 14:38:08 -07:00
Stephen Birarda	29cd487f84	fixes for styling and logging from CR	2016-03-15 14:38:08 -07:00
Stephen Birarda	b8abb1b6dd	remove redundant static from const in AssetServer	2016-03-15 14:38:08 -07:00
Stephen Birarda	72c64532f5	Merge branch 'master' of https://github.com/highfidelity/hifi into atp	2016-03-15 09:12:49 -07:00
Seth Alves	0a2fb77698	delete child entities when parent is deleted	2016-03-13 07:04:50 -07:00
Stephen Birarda	630f5303b2	overwrite existing asset during upload if hash doesn't match	2016-03-11 13:23:57 -08:00
Stephen Birarda	e51aedeb35	fix error handling for diff request types	2016-03-11 11:36:52 -08:00
Stephen Birarda	9522c2d17c	add file open and write error handling	2016-03-11 11:04:34 -08:00
Stephen Birarda	6f550292f4	pass delete paths by reference for trimming	2016-03-10 16:57:39 -08:00
Stephen Birarda	e94e2ece2e	add trimming to paths on asset server	2016-03-10 16:57:39 -08:00
Stephen Birarda	e93bc8317f	remove an extra space	2016-03-10 14:48:44 -08:00
Stephen Birarda	50a05df721	fix asset loading with error changes	2016-03-10 11:58:57 -08:00
Stephen Birarda	99718e9c4e	short circuit the mapping operations for invalid path/hash	2016-03-10 10:52:05 -08:00
Stephen Birarda	ae3c0f6646	add hash and path checking	2016-03-09 18:03:44 -08:00
Stephen Birarda	672f8ec1f7	add checking for leading slash in mapping operations	2016-03-09 17:43:31 -08:00
Stephen Birarda	7b08ae3747	drop invalid mappings on AssetServer load	2016-03-09 17:30:02 -08:00
Clément Brisset	aeee89eb15	Merge pull request #86 from birarda/atp-mappings disable client caching of ATP mappings, fix bug retreiving assets	2016-03-09 14:40:57 -08:00
Stephen Birarda	e2b976d9f1	remove debug, fix asset find bug for incorrect folder	2016-03-09 14:24:35 -08:00
Stephen Birarda	a986403237	add a leading slash for faked migrated mappings	2016-03-09 13:42:35 -08:00
Stephen Birarda	d3dc81c7a0	add delete debug, handle rename in memory state rollback	2016-03-09 13:37:39 -08:00
Stephen Birarda	5e9751c6ed	bug fixes for rename/delete operations	2016-03-09 13:28:05 -08:00
Stephen Birarda	a65d06c7ce	fix rename to take old mapping first	2016-03-09 13:14:55 -08:00
Stephen Birarda	4bbb8779e3	Merge branch 'atp' of github.com:birarda/hifi into atp-rename-mapping	2016-03-09 12:17:24 -08:00
Stephen Birarda	6b8a71f96a	add debug for mapping operations	2016-03-09 12:16:36 -08:00
Stephen Birarda	a53b038ac2	add folder delete handling	2016-03-09 12:10:36 -08:00
Stephen Birarda	03c38eada3	add folder rename handling	2016-03-09 12:06:33 -08:00
Clément Brisset	3f50abcd17	Merge pull request #82 from birarda/atp-rename-mapping add rename mapping operation for atomic rename	2016-03-09 11:57:20 -08:00
Stephen Birarda	87d5958eb8	Merge branch 'master' of https://github.com/highfidelity/hifi into atp	2016-03-08 17:11:18 -08:00
Stephen Birarda	6abd1c50b2	remove the inlined writeError in AssetServer	2016-03-08 15:45:13 -08:00
Brad Hefta-Gaub	8d4ef28411	CR feedback	2016-03-08 15:29:04 -08:00
Stephen Birarda	33cadb36da	add server side handling for mapping rename	2016-03-08 14:57:22 -08:00
Brad Hefta-Gaub	35d6afbe77	Merge branch 'master' of https://github.com/highfidelity/hifi into fixSceneNotStable	2016-03-08 14:53:41 -08:00
Brad Hefta-Gaub	6d211dd4e5	first cut at fixing the scene not stable bug	2016-03-08 14:52:21 -08:00
Stephen Birarda	793d20306d	handle multiple paths for mapping delete operations	2016-03-08 14:24:03 -08:00
Stephen Birarda	8fa32e75b2	client side fixes for upload with no extension	2016-03-08 12:19:15 -08:00
Stephen Birarda	1ece9aac26	remove extension from asset upload task	2016-03-08 12:08:02 -08:00
Stephen Birarda	7cc774c5f4	indentation fix for _filesDirectory in AssetServer	2016-03-08 11:55:29 -08:00
Stephen Birarda	c4845e5ae5	remove getMapping call from AssetServer that is unused	2016-03-08 11:50:23 -08:00
Stephen Birarda	4608eddb40	remove an extra blank line	2016-03-08 11:47:55 -08:00
Stephen Birarda	7ecfc20dc2	add error handling for asset-server files directory	2016-03-08 11:47:11 -08:00
Stephen Birarda	4236d8e147	replace toLocal8Bit with toUtf8 for hex conversions	2016-03-08 11:40:35 -08:00
Stephen Birarda	063826638e	move handling of get all operation to sep method	2016-03-08 11:39:28 -08:00
Stephen Birarda	bfb9801b22	Merge branch 'atp' of github.com:birarda/hifi into atp-mappings	2016-03-08 11:37:27 -08:00
Stephen Birarda	7bf6b8405c	pluralize mappings in AssetServer naming	2016-03-08 10:28:59 -08:00
Ryan Huffman	89b37f78f0	Make AssetServer response reliable and ordered	2016-03-08 10:26:50 -08:00
Ryan Huffman	7db296fa69	Remove unused get/set/deleteMapping in AssetServer	2016-03-08 10:23:48 -08:00
Ryan Huffman	88760d389f	Merge branch 'master' of https://github.com/highfidelity/hifi into atp-mappings	2016-03-08 10:21:32 -08:00
Stephen Birarda	a3533b0b7d	repairs for moved packet handling in AssetServer	2016-03-08 10:21:29 -08:00
Stephen Birarda	fa04f08c4c	use toHex/fromHex for more compact messaging	2016-03-08 10:01:54 -08:00
Stephen Birarda	da3e3b7e6c	add handle calls for mapping operations	2016-03-08 09:55:48 -08:00
Stephen Birarda	ed9faf4189	add a secondary check for local IP address	2016-03-07 18:00:09 -08:00
Ryan Huffman	37c0417ea6	Add GetAll and Delete mapping requests	2016-03-07 16:31:49 -08:00
Stephen Birarda	12a774d47f	return error if persistence fails for set/delete operations	2016-03-07 15:46:44 -08:00
Stephen Birarda	5aa287a789	handle read/write to asset-server map file	2016-03-07 15:30:30 -08:00
Stephen Birarda	82cd8aed8c	protect mapping clobbering when migrating	2016-03-07 14:46:54 -08:00
Stephen Birarda	18b22cbd16	add a mapping for pre-mapping migrated files	2016-03-07 14:43:17 -08:00
Stephen Birarda	9d61de6cd5	add a mapping migration for pre-mapping assets	2016-03-07 14:38:55 -08:00
Stephen Birarda	7bb97ec3da	add an extra space before debug in AssetServer	2016-03-07 13:57:12 -08:00
Stephen Birarda	e7124d4b10	add server handling for no extension requests	2016-03-07 13:57:11 -08:00
Ryan Huffman	9eb0fdf589	Clean up AssetServer mapping handling	2016-03-07 13:50:08 -08:00
Ryan Huffman	6b485cf81d	Update atp mapping operations to use a single packet	2016-03-07 13:49:55 -08:00
Ryan Huffman	9148db2612	Clean up AssetServer mapping handling	2016-03-07 13:22:23 -08:00
Stephen Birarda	0b578bf086	only enable logging if a log directory is passed	2016-03-04 12:56:35 -08:00
Stephen Birarda	efa46b8c7b	add option to disable AC child file logging	2016-03-04 11:58:46 -08:00
Ryan Huffman	db98e46bb8	Update atp mapping operations to use a single packet	2016-03-01 16:18:35 -08:00
Atlante45	7b179ab91a	First draft for mapping requests	2016-03-01 13:08:46 -08:00
Stephen Birarda	f44cf3903c	re-instate verified domain ownership for full automatic networking This reverts commit `34408c8144`.	2016-03-01 13:04:37 -08:00
Atlante45	6a4b93a4e7	Proper fix for DiskCacheInfo	2016-03-01 12:00:43 -08:00
Atlante45	2c1762526d	Move all resource requests to the same thread	2016-03-01 12:00:43 -08:00
Clément Brisset	2ffaa1f2e7	Merge pull request #7196 from AndrewMeadows/simulation-ownership no expiry for simulation ownership	2016-02-29 08:26:53 -08:00
Andrew Meadows	2591c5ee3e	cleanup names that use "keyhole"	2016-02-25 18:09:35 -08:00
Stephen Birarda	34408c8144	Revert "verified domain ownership for full automatic networking"	2016-02-25 17:02:08 -08:00
Clément Brisset	2e7c7eace5	Merge pull request #7179 from birarda/domain-security verified domain ownership for full automatic networking	2016-02-25 15:24:09 -08:00
Andrew Meadows	b4edfe2390	no expiry for simulation ownership	2016-02-25 12:07:20 -08:00
Thijs Wenker	a716d971d9	Merge branch 'master' of https://github.com/highfidelity/hifi into 20774_fix	2016-02-25 02:18:40 +01:00
Stephen Birarda	f553becabe	data-server name tweak and isAgent behaviour change	2016-02-19 16:04:45 -08:00
Brad Hefta-Gaub	c699c828cd	Merge pull request #7092 from birarda/assets-abs-path add setting to DS for asset path, handle absolute paths	2016-02-12 17:43:23 -08:00
Andrew Meadows	2f2d1b5d22	Merge pull request #7076 from birarda/integrate-new-hrtf use injector not mixed count for inactivity	2016-02-12 15:14:53 -08:00
Stephen Birarda	27d338e81c	make any asset path relative to assets dir	2016-02-11 15:49:13 -08:00
Stephen Birarda	8eaea8a7ff	clarify asset-server migration message	2016-02-11 15:42:35 -08:00
Stephen Birarda	f117bd5867	fix check for string assets path	2016-02-11 15:38:50 -08:00
Stephen Birarda	7c0b3953e4	handle custom path in asset-server for assets	2016-02-11 15:34:43 -08:00
Clément Brisset	911591c0ea	Merge pull request #7082 from birarda/hrtf-map-crash fix for HRTF map crash	2016-02-11 09:57:20 -08:00
Stephen Birarda	52cd4ae1a5	make sure the AudioMixerClientData exists before using it	2016-02-11 09:34:21 -08:00
Stephen Birarda	367e558b19	address PR comments for whitespace and constant	2016-02-11 09:30:07 -08:00
Stephen Birarda	f0ca412b29	use the existing not mixed count for injector inactivity	2016-02-10 18:22:57 -08:00
Stephen Birarda	edfb65acf6	more stats printing removal from audio-mixer	2016-02-10 17:38:56 -08:00
Stephen Birarda	6707535ced	remove unused and incorrect stats from DS stats	2016-02-10 17:33:56 -08:00
Stephen Birarda	97cd65cf80	don't use usecTimestampNow for per second actions	2016-02-10 15:07:58 -08:00
Stephen Birarda	8598360f2e	allow string values to be graphable in DS stats	2016-02-10 11:50:23 -08:00
Stephen Birarda	a9fc69b4ac	cleanup percentage calculation for AM mix stats	2016-02-10 10:49:13 -08:00
Stephen Birarda	26fd0c305a	push the length threshold to 1e-30	2016-02-09 17:14:23 -08:00
Stephen Birarda	a8841b475f	specify float instead of implicitly converted double	2016-02-09 17:05:16 -08:00
Stephen Birarda	1a7738353a	use a length check against source listener distance	2016-02-09 17:01:18 -08:00
Stephen Birarda	e0cb8db914	handle zero distance from listener to source	2016-02-09 16:51:23 -08:00
Stephen Birarda	87b85d6951	more useful stats for new HRTF mixer	2016-02-09 16:39:45 -08:00
Stephen Birarda	87d1d0a49c	call renderSilent when audio-mixer is struggling	2016-02-09 15:30:51 -08:00
Stephen Birarda	95d0734d7f	fix for windows size_t warning	2016-02-09 15:20:34 -08:00
Stephen Birarda	2cecfc499b	correct azimuth for HRTF	2016-02-09 15:03:55 -08:00
Stephen Birarda	84b87b6f38	remove the unused AUDIO_MIXER_DEBUG define	2016-02-09 14:34:02 -08:00
Stephen Birarda	04dc55686b	remove some comments for HRTF cleanup tests	2016-02-09 14:31:31 -08:00
Stephen Birarda	7b2726f89b	ensure that injectors are cleaned up once inactive	2016-02-09 14:30:59 -08:00
Stephen Birarda	1773233af4	cleanup management of HRTF objects across connected Nodes	2016-02-09 14:30:44 -08:00
Stephen Birarda	a6a694c704	fix mixing bugs post HRTF integration	2016-02-09 11:58:55 -08:00
Stephen Birarda	1ce1a73f92	some concurrency repairs for AudioMixerClientData streams	2016-02-09 10:29:02 -08:00
Stephen Birarda	73690fe4cb	use unique_ptr for audio streams in AudioMixerClientData	2016-02-08 18:45:14 -08:00
Stephen Birarda	fd96f0d960	leverage new HRTF in audio-mixer mix preparation	2016-02-08 18:12:25 -08:00
Stephen Birarda	445662f5ae	clean sweep of old now unused audio files	2016-02-08 15:38:12 -08:00
James B. Pollack	3c9043987f	Merge pull request #7019 from birarda/absolute-paths allow absolute path to entity-server persist file	2016-02-04 08:53:21 -08:00
James B. Pollack	8b09cf3b82	Merge pull request #7024 from birarda/audio-mute-crash fix for audio-mixer mute env crash	2016-02-04 08:53:10 -08:00
Andrew Meadows	63df34541d	Merge pull request #6802 from huffman/agent-simulation Fix Agents bidding on simulation ownership	2016-02-03 13:45:12 -08:00
Stephen Birarda	ea9d84bdc4	handle downloading of absolute persist file contents	2016-02-03 13:18:29 -08:00
Stephen Birarda	0e20392e66	remove debug for mute environment packet	2016-02-03 11:07:16 -08:00
Stephen Birarda	26abca92ae	don't move the re-used mute environment packet	2016-02-03 10:55:07 -08:00
Stephen Birarda	2c1623ed42	use extension with preceeding period	2016-02-02 16:07:14 -08:00
Stephen Birarda	8ab15770b8	use absolutePath for absolute persist path	2016-02-02 15:52:12 -08:00
Stephen Birarda	99d1fa08fd	handle incorrect casing in persist file extension	2016-02-02 15:49:40 -08:00
Stephen Birarda	90b78feb1e	force models file to end in .json.gz	2016-02-02 15:37:34 -08:00
Stephen Birarda	4d91b8b7d6	fix check for existing persist file directory	2016-02-02 14:38:17 -08:00
Stephen Birarda	cfff765731	allow for absolute path handling at entity-server	2016-02-02 14:21:34 -08:00
Stephen Birarda	79dc2d5d55	add some debug for mute environment crash	2016-02-02 11:40:15 -08:00
Ryan Huffman	eff02d3e3a	Fix Agents bidding on simulation ownership	2016-02-02 10:47:51 -08:00
Stephen Birarda	095f0b9349	rename canAdjustLocks to isAllowedEditor for multi-purpose	2016-02-01 16:46:11 -08:00
Stephen Birarda	0e016838b4	tweak size of values in AudioMixer	2016-01-29 14:04:45 -08:00
Howard Stearns	f00ec8de5d	Merge pull request #6947 from huffman/fix-entity--mkdir Update entity server to always make resource directory if it does not…	2016-01-27 13:03:00 -08:00
Ryan Huffman	a731a571e0	Update entity server to always make resource directory if it does not exist	2016-01-26 13:50:58 -08:00
Stephen Birarda	1e87fe77f2	return the result of PositionalAudioStream parseData	2016-01-25 13:47:20 -08:00
Stephen Birarda	7430b12db6	add some debug for stream overflows in audio-mixer	2016-01-25 13:30:19 -08:00
Stephen Birarda	cc96d90a21	Merge pull request #6897 from huffman/fix-asset-migration Fix asset server not creating resources directory before migrating	2016-01-21 18:25:48 -08:00
Brad Hefta-Gaub	7bfe2730e8	Merge pull request #6849 from jherico/atmosphere Remove old atmosphere rendering	2016-01-21 17:58:59 -08:00
Ryan Huffman	f9718931b0	Fix asset server not creating resources directory before migrating	2016-01-21 17:40:12 -08:00
Stephen Birarda	9127edc968	Merge pull request #6892 from huffman/fix-asset-migration Fix ATP file copy	2016-01-21 17:15:46 -08:00
Brad Hefta-Gaub	094e41c993	Merge pull request #6888 from Atlante45/fix/wifi-ping-spikes Fix wifi ping spikes	2016-01-21 17:07:38 -08:00
Ryan Huffman	99bb1fcbe1	Remove dirs from atp copy	2016-01-21 16:46:45 -08:00
Ryan Huffman	c9ea6e7eb6	Fix ATP file copy	2016-01-21 16:45:13 -08:00
Leonardo Murillo	a3ccf7014c	Merge pull request #6890 from huffman/fix-asset-migration Fix asset server data migration	2016-01-21 18:12:07 -06:00
Ryan Huffman	996f3f5df7	Fix entity server data migration to work with default persist filename	2016-01-21 15:43:45 -08:00
Ryan Huffman	e63ac03123	Fix asset server data migration	2016-01-21 15:26:52 -08:00
Brad Davis	b8109af196	Ignite the atmosphere	2016-01-21 15:15:15 -08:00
Atlante45	db18d188b8	Fix wifi ping spikes Moves the setting of Qt's bearer poll timeout earlier to be sure it's caught.	2016-01-21 15:05:32 -08:00
Leonardo Murillo	098b7a4ff3	Merge pull request #6870 from birarda/console Your Stack Manager is now a Server Console	2016-01-21 14:31:34 -06:00
Stephen Birarda	7c9dc2e2bb	add a comment for QProcess non-dangling pointer	2016-01-21 11:02:34 -08:00
Stephen Birarda	63da0074b4	repair the audio-mixer coma debug	2016-01-21 10:26:03 -08:00
Stephen Birarda	5e451360f7	add some debug for the next audio mixer coma	2016-01-20 18:22:37 -08:00
Ryan Huffman	c31ceeca86	Add deletion of old log files	2016-01-20 15:35:30 -08:00
Stephen Birarda	8bc063e758	Merge branch 'master' of https://github.com/highfidelity/hifi into console	2016-01-19 16:21:19 -08:00
Stephen Birarda	fdda93a62d	set the build version on assignment-client	2016-01-19 16:04:41 -08:00
Ryan Huffman	4ce20242b1	Fix asset server data migration	2016-01-19 15:50:45 -08:00
Ryan Huffman	37cfac404e	Move octree server data directory to /web	2016-01-19 15:23:14 -08:00
Ryan Huffman	58344416fd	Remove extra whitespace	2016-01-19 15:16:17 -08:00
Ryan Huffman	84f4b4b935	Remove dead code	2016-01-19 15:15:54 -08:00
Ryan Huffman	4afb6992c3	Move entities resources into /entities	2016-01-19 14:41:57 -08:00
Ryan Huffman	c417bc0fb3	Move asset resource directory out of /resources	2016-01-19 14:41:57 -08:00
Stephen Birarda	fcaf38cc57	don't set AC version for data directory fix	2016-01-15 15:56:47 -08:00
Stephen Birarda	0876da7a7d	call manual install of ssleay from console install	2016-01-15 15:41:34 -08:00
Stephen Birarda	cf5b6198fd	use install command to manually place ssleay library	2016-01-15 15:41:34 -08:00
Stephen Birarda	05e48528bd	make sure SSL_EAY_LIBRARY_* is set when used	2016-01-15 15:41:34 -08:00
Stephen Birarda	c1a9a7f4c1	add ssleay copy for win AC/DS/Interface	2016-01-15 15:41:34 -08:00
Stephen Birarda	0b118a8e98	replace ApplicationVersion with BuildInfo	2016-01-15 15:41:34 -08:00
Stephen Birarda	1faa78fe72	install fixed up DS and AC beside console	2016-01-15 15:41:34 -08:00
Stephen Birarda	e421624e99	put AC and DS binaries beside server-console	2016-01-15 15:41:34 -08:00
Stephen Birarda	e6ccce6a38	fix placement of _logDirectory member variable	2016-01-15 15:41:34 -08:00
Ryan Huffman	0f2b9744d1	Merge branch 'console' of github.com:birarda/hifi into console-logging	2016-01-15 10:46:22 -08:00
Ryan Huffman	a9afa53fb7	Add migration of old octree server data	2016-01-14 12:57:48 -08:00
Ryan Huffman	fc42254be1	Add migration of old Asset server data	2016-01-14 12:57:29 -08:00
Ryan Huffman	196161fe93	Merge pull request #66 from birarda/console-dev some initial packaging work and console fixes	2016-01-14 10:17:24 -08:00
Thijs Wenker	6808e25fdf	zone ranges to min and max variables, this way it is more oversee-able with the new negative positioning system	2016-01-13 01:26:32 +01:00
Brad Davis	d28f80aa07	Moving running scripts functionality to scripting library	2016-01-11 12:44:03 -08:00
Ryan Huffman	46ed5f6479	Fix AssignmentParentFinder not handling null parentID	2016-01-09 14:27:57 -08:00
Ryan Huffman	4851def51c	Add status HTTP server to AC Monitor	2016-01-08 10:35:04 -08:00
Stephen Birarda	404fb2f781	Merge branch 'master' of https://github.com/highfidelity/hifi into console	2016-01-07 16:02:32 -08:00
Seth Alves	ce1b8ae6f0	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2016-01-04 19:35:36 -08:00
Stephen Birarda	7304e695b3	resolve conflicts on merge with upstream/master	2016-01-04 15:40:16 -08:00
Stephen Birarda	b3e46d1ed8	some macro renaming and cleanup	2016-01-04 10:26:37 -08:00
Brad Davis	3b4f5d36a5	PR feedback	2016-01-03 12:29:32 -08:00
Stephen Birarda	abea65fa84	resolve conflicts on merge with upstream/master	2015-12-29 17:54:45 -08:00
Seth Alves	f0bffe7a24	fix success return value	2015-12-21 14:29:07 -08:00
Seth Alves	bc52576ba2	Merge branch 'fix-entity-server-crash' of github.com:sethalves/hifi into near-grab-via-parenting	2015-12-19 08:14:15 -08:00
Seth Alves	9271209d89	another	2015-12-19 08:13:53 -08:00
Seth Alves	a175bb85f9	Merge branch 'fix-entity-server-crash' of github.com:sethalves/hifi into near-grab-via-parenting	2015-12-19 08:09:44 -08:00
Seth Alves	8b9de716f1	fix bad pointer juju	2015-12-19 08:08:10 -08:00
Seth Alves	d34e166b48	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2015-12-17 07:31:52 -08:00
Atlante45	2c8be15e66	Unnecessary shutdown (Already shutting down)	2015-12-16 15:56:22 -08:00
Atlante45	b709c8162c	Fix node flapping race	2015-12-16 14:27:26 -08:00
Atlante45	6bda8d3f18	CR logging category	2015-12-16 14:27:26 -08:00
Atlante45	b55d8f750f	CR	2015-12-16 14:27:26 -08:00
Atlante45	0f7093bed7	Whitespace	2015-12-16 14:27:26 -08:00
Atlante45	df24fafe49	CR feedback	2015-12-16 14:27:26 -08:00
Atlante45	a655557af0	Make variable name more obvious	2015-12-16 14:27:26 -08:00
Atlante45	b4dc3b1b47	Fix windows compile error.	2015-12-16 14:27:26 -08:00
Atlante45	a541fdd2df	Move OctreeSendThread to the OctreeServer	2015-12-16 14:27:26 -08:00
Atlante45	51ec7ae2ed	Keep UUID of node in send thread	2015-12-16 14:27:26 -08:00
Atlante45	3cd1eea1dc	Use weak pointer to the Node instead of strong ownership	2015-12-16 14:27:26 -08:00
Atlante45	346c28f9e2	Remove OctreeServer's static instance	2015-12-16 14:27:26 -08:00
Atlante45	09701fdcf1	deadlock 101	2015-12-16 14:27:26 -08:00
Atlante45	b65cdd2865	Add logging categories to assignment client.	2015-12-16 14:27:26 -08:00
Atlante45	bd7fa266cf	Bit of cleanup	2015-12-16 14:27:26 -08:00
Seth Alves	45d19167c9	fix a couple of missing-parent bugs	2015-12-16 10:09:46 -08:00
Ryan Huffman	b907a04a3f	Add log directory to AssignmentClientMonitor	2015-12-16 09:08:51 -08:00
Ryan Huffman	195f58e130	Add log-directory option to AC monitor	2015-12-16 08:51:13 -08:00
Seth Alves	a3631ea1d1	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2015-12-15 10:12:49 -08:00
Seth Alves	b9fc368857	Merge pull request #6633 from huffman/agent-spatial-finder Add AssignmentParentFinder to Agent	2015-12-14 09:35:27 -08:00
Seth Alves	008065ba38	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2015-12-14 09:15:56 -08:00
Seth Alves	c74f8bca49	location getters also return a success boolean so that callers can know if the value they are receiving is bad due to lack of information about an object's parent	2015-12-14 09:13:36 -08:00
Atlante45	ce51350b65	Fix warnings on windows 64bit	2015-12-11 15:42:15 -08:00
Ryan Huffman	66ed8dc053	Add AssignmentParentFinder to Agent	2015-12-11 14:51:14 -08:00
Brad Hefta-Gaub	a7a924153a	Merge pull request #6617 from huffman/entity-query-keyhole Add keyhole radius to OctreeQuery	2015-12-11 09:35:46 -08:00
Brad Hefta-Gaub	c1fe30ff49	Merge pull request #6620 from huffman/fix-agent-entity-delete Fix EntityErase packets not being handled on agents	2015-12-10 17:27:21 -08:00
Ryan Huffman	4c8b7aa800	Fix EntityErase packets not being handled on agents	2015-12-10 16:26:16 -08:00
Ryan Huffman	b5e3dce376	Add keyhole radius to OctreeQuery	2015-12-10 14:34:28 -08:00
Brad Hefta-Gaub	2fbabf20db	properly handle repack attempts	2015-12-10 14:03:06 -08:00
Leonardo Murillo	dda99bfea6	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-12-08 14:07:50 -08:00
Leonardo Murillo	25494ec867	Merge pull request #6562 from Atlante45/baseball Baseball	2015-12-07 14:11:21 -08:00
Clément Brisset	42365acef5	Merge pull request #6561 from ZappoMan/cruftRemovalRedux More Cruft Removal	2015-12-07 11:39:54 -08:00
Ryan Huffman	34138f07bd	Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message	2015-12-07 08:58:47 -08:00
Seth Alves	62b4eac875	fix avatar-mixer parents-related crash	2015-12-04 16:41:56 -08:00
Atlante45	1d498af76e	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-12-04 15:18:25 -08:00
Brad Hefta-Gaub	46946212cf	remove WANT_LOW_RES_MOVING_BIT from OctreeQuery always true	2015-12-04 14:24:31 -08:00
Brad Hefta-Gaub	f44a9daa21	remove WANT_DELTA from OctreeQuery	2015-12-04 14:04:57 -08:00
Brad Hefta-Gaub	0d9d5375c7	remove optional WANT_COMPRESSION from OctreeQuery	2015-12-04 13:29:18 -08:00
Ryan Huffman	89c412c324	Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message	2015-12-04 11:38:28 -08:00
Brad Hefta-Gaub	d9a1563396	Merge pull request #6152 from sethalves/parents Parents	2015-12-04 10:26:57 -08:00
Brad Hefta-Gaub	49a7852d76	Merge pull request #6540 from Atlante45/warnings Fix warnings on OS X	2015-12-04 10:19:25 -08:00
Atlante45	cb758ca6b4	Fix override warnings on XCode 7	2015-12-04 08:55:43 -08:00
Brad Hefta-Gaub	f472b515c3	remove wantsColor support since its always true and required for entities	2015-12-03 21:03:32 -08:00
Brad Hefta-Gaub	81fb4476bc	remove coverage map and occulusion culling, since it was always disabled	2015-12-03 20:29:23 -08:00
Brad Hefta-Gaub	5a75a17174	Revert "Cruft removal"	2015-12-03 17:40:41 -08:00
Brad Hefta-Gaub	1a5bc5d111	removing optional compression	2015-12-03 12:40:24 -08:00
Brad Hefta-Gaub	849a8707d2	remove wantsColor support since its always true and required for entities	2015-12-03 11:11:15 -08:00
Seth Alves	4e74c98ae7	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-12-03 11:00:13 -08:00
Brad Hefta-Gaub	0c05ffe9ce	remove coverage map and occulusion culling, since it was always disabled	2015-12-03 10:20:04 -08:00
Ryan Huffman	ce882a9c11	Replace QSharedPointer ctor with ::create	2015-12-03 09:43:36 -08:00
Brad Hefta-Gaub	4497d21aec	remove nodes that disconnect from out viewer stats	2015-12-02 14:51:48 -08:00
Brad Hefta-Gaub	1e51a90204	add edit times and entity ids to the viewer stats	2015-12-02 14:43:00 -08:00
Seth Alves	6eae98fb28	merge from upstream	2015-12-02 14:38:26 -08:00
Brad Hefta-Gaub	08ba535c38	add some basic send tracking	2015-12-02 13:43:05 -08:00
Brad Hefta-Gaub	75a57c3cb8	Merge pull request #6500 from Atlante45/octree_crash Octree crash fix	2015-12-02 09:59:56 -08:00
Atlante45	c3e2d920ee	Move timing at the top	2015-12-02 09:45:51 -08:00
Seth Alves	0595ef0938	merge from upstream	2015-12-02 09:30:19 -08:00
Leonardo Murillo	f5dfc7d3e4	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-12-02 10:42:57 -06:00
Brad Hefta-Gaub	82d6718d8b	Merge pull request #6510 from birarda/es-deadlock fix infinite loop on shutdown in OctreeInboundPacketProcessor	2015-12-02 08:16:28 -08:00
Atlante45	0bc914bf19	Don't grab subTree outside lock	2015-12-01 19:33:44 -08:00
Atlante45	f06b5b05b3	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-12-01 15:14:58 -08:00
Howard Stearns	8f7f3eed6e	ScriptAvatar now gets the .fbx joints: Because the joint mappings in the .fst can be wrong when the .fst isn't updated for quick changes in the .fbx. Because models now really need the preRotation, which is only in the avatar .fbx.	2015-12-01 11:52:42 -08:00
Stephen Birarda	557ab315d9	make resettable stats atomic	2015-12-01 10:51:52 -08:00
Stephen Birarda	27227181f0	fix for infinite loop in OctreeeInboundPacketProcessor	2015-12-01 10:45:19 -08:00
Leonardo Murillo	418b9c8fea	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-12-01 11:57:38 -06:00
Atlante45	083205916f	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-30 18:25:53 -08:00
Seth Alves	b7ebe5b92b	merge from upstream	2015-11-30 16:59:52 -08:00
Clément Brisset	e168966b87	Merge pull request #6409 from birarda/injector-hybrid more efficient threading of networked AudioInjector objects	2015-11-30 15:36:41 -08:00
Atlante45	4aaa9ca02f	Make OctreeElementBag safer to use	2015-11-30 15:23:49 -08:00
Stephen Birarda	4573e5c59e	resolve conflicts on merge with upstream/master	2015-11-30 13:32:38 -08:00
Ryan Huffman	1b0413f8e3	Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message	2015-11-30 10:23:40 -08:00
Seth Alves	081174fe69	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-11-30 10:18:01 -08:00
Andrew Meadows	49a6f63663	remove whitespace and fix warning (unused var)	2015-11-30 10:00:05 -08:00
Seth Alves	ca75802b9c	unmangle merge	2015-11-26 06:43:28 -08:00
Atlante45	a364e85e1d	Remove DeleteHooks	2015-11-25 17:21:56 -08:00
Leonardo Murillo	b7cdca75b7	Checkpoint towards integrated delivery	2015-11-24 16:12:04 -06:00
Ryan Huffman	669d3c3523	Rename several ReceivedMessage params from packet to message	2015-11-24 11:29:02 -08:00
Ryan Huffman	dac491ef41	Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message	2015-11-24 09:59:22 -08:00
Stephen Birarda	7f7d05fc42	fix double initialization of AssetClient in Agent	2015-11-24 10:46:35 -06:00
Stephen Birarda	ab7cbc0b76	Merge branch 'master' of https://github.com/highfidelity/hifi into injector-hybrid	2015-11-24 10:45:00 -06:00
Brad Hefta-Gaub	82ff0af05c	Merge pull request #6472 from murillodigital/stack-manager Stack manager - integration checkpoint	2015-11-23 16:53:53 -08:00
Seth Alves	5fe41662d8	fix comment header paths	2015-11-23 14:31:40 -08:00
Stephen Birarda	0997d3dcae	resolve conflicts on merge with upstream/master	2015-11-23 16:15:15 -06:00
Seth Alves	ba30e01664	include global position in avatar-mixer protocol so server knows where avatars are in world-space	2015-11-23 14:12:49 -08:00
samcake	25654824a2	Copy pasting the code that Stephen did and also adding the AssetServer to the list of dependent nodes for the agent	2015-11-23 12:32:27 -08:00
Leonardo Murillo	ec6be93938	Merge branch 'master' of https://github.com/highfidelity/hifi into stack-manager	2015-11-23 14:22:05 -06:00
samcake	301f0ba145	Trying to instenciate the AssetCLient in the Agent	2015-11-23 11:48:02 -08:00
Seth Alves	f013f95e9b	merge from upstream	2015-11-21 08:43:00 -08:00
samcake	5d17fa0b34	Merge pull request #6458 from ZappoMan/acPlayback allow playbackAgents to auto-register	2015-11-20 16:25:02 -08:00
Stephen Birarda	b24b095c90	add a missing space in Agent	2015-11-20 16:09:41 -08:00
Brad Hefta-Gaub	f56d2fba7f	allow playbackAgents to auto-register	2015-11-20 16:00:43 -08:00
Leonardo Murillo	5d2700309d	Merge branch 'master' of github.com:highfidelity/hifi into stack-manager	2015-11-20 17:43:25 -06:00
Stephen Birarda	9ddebc8d13	resolve conflicts on merge with upstream/master	2015-11-20 15:29:44 -08:00
Clément Brisset	5d75fcbfce	Merge pull request #6430 from birarda/unique_linked_data use a unique_ptr for linkedData in Node	2015-11-20 15:01:41 -08:00
Brad Hefta-Gaub	b5d764814c	Merge pull request #6450 from birarda/agent-script-fail fix for agent script download fail	2015-11-20 13:29:10 -08:00
Leonardo Murillo	d17bf28bce	Merge branch 'master' of github.com:highfidelity/hifi into stack-manager	2015-11-20 15:20:08 -06:00
Leonardo Murillo	e17d0b2af3	Bundling and consolidating deployment package	2015-11-20 15:10:56 -06:00
Stephen Birarda	b34934b849	resolve conflicts on merge with upstream/master	2015-11-20 11:52:53 -08:00
Stephen Birarda	cf204ad5b0	cleanup executeScript comment in Agent	2015-11-20 11:44:58 -08:00
Stephen Birarda	aa836aa4b5	add a script request timeout	2015-11-20 11:44:04 -08:00
Stephen Birarda	3b40119992	use Agent session UUID to request script	2015-11-20 11:35:24 -08:00
Brad Hefta-Gaub	7441e20f58	cleanup	2015-11-20 11:20:36 -08:00
Brad Hefta-Gaub	4bbfcb6092	Merge branch 'master' of https://github.com/highfidelity/hifi into messaging	2015-11-20 10:30:38 -08:00
Brad Hefta-Gaub	e530aa6545	don't assert on sender mismatch	2015-11-20 09:58:28 -08:00
Brad Hefta-Gaub	abf169ebd9	fix senderID in messages, dry up code	2015-11-20 09:03:21 -08:00
Stephen Birarda	8f5212acac	use destroy instead of accidental set	2015-11-19 17:26:10 -08:00
Ryan Huffman	07d21514c5	Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message	2015-11-19 10:47:37 -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
Stephen Birarda	271387f96e	use a unique_ptr for linkedData in Node	2015-11-18 18:03:31 -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
Ryan Huffman	2a416ebc61	Merge branch 'master' of https://github.com/highfidelity/hifi into received-message	2015-11-18 16:52:23 -08:00
Stephen Birarda	3773995bb7	remove true return for readAdditionalConfiguration	2015-11-18 15:41:27 -08:00
Stephen Birarda	cb708859fb	resolve conflicts on merge with upstream master	2015-11-18 15:34:56 -08:00
Stephen Birarda	3ba0c9d042	resolve conflicts on merge with upstream master	2015-11-18 15:29:39 -08:00
Stephen Birarda	20485b817c	use safer domain-server settings request in entity-server	2015-11-18 15:27:57 -08:00
Stephen Birarda	eafc11e054	use safer domain settings request in AvatarMixer	2015-11-18 15:18:16 -08:00
Stephen Birarda	f2ecce6043	use safer domain settings request in audio-mixer	2015-11-18 15:13:29 -08:00
Brad Davis	5b8047ded4	Make recording and playback work in interface, playback in agent	2015-11-18 14:04:45 -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
Stephen Birarda	d90c073102	leverage NL keep alive pings in Agent	2015-11-18 10:25:18 -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
samcake	368f19b4e2	Merging with todays upstream and checking	2015-11-17 18:58:10 -08:00
Stephen Birarda	2355ba70ca	just remove messages-mixer settings grabbing all together	2015-11-17 18:55:09 -08:00
Stephen Birarda	c21fbc9a46	fix for messages-mixer bail early on empty settings	2015-11-17 18:53:23 -08:00
samcake	d2f3b48637	Merge branch 'master' of https://github.com/highfidelity/hifi into controllers	2015-11-17 17:36:38 -08:00
Stephen Birarda	5dc48dc9dc	resolve conflicts on merge with upstream/master	2015-11-17 17:04:12 -08:00
Stephen Birarda	8e4d7c69ce	handle AudioInjectorManager for scripted ACs	2015-11-17 17:01:11 -08:00
Brad Hefta-Gaub	6dfcc53c27	properly handle removing subscribers from channels when the subscriber node disconnects	2015-11-17 14:19:13 -08:00
Brad Hefta-Gaub	32bf81ef0d	move MessagesClient to agent	2015-11-17 12:59:12 -08:00
Brad Hefta-Gaub	5b9791d800	add message received signal	2015-11-17 11:50:10 -08:00
Brad Hefta-Gaub	e7a8df306c	fix warnings	2015-11-17 11:18:36 -08:00
Brad Hefta-Gaub	1c2c37ff44	more cleanup work	2015-11-17 11:10:12 -08:00
Brad Hefta-Gaub	034debc483	cleanup	2015-11-17 10:59:53 -08:00
Brad Hefta-Gaub	1f7c70a0d1	implement proper sending	2015-11-17 10:28:50 -08:00
Brad Hefta-Gaub	6b61ec569c	more work on channels	2015-11-17 09:47:50 -08:00
Sam Gateau	5b92929833	Moving the REcordingScriptingInterface into the script-engine and wiiring up in the assignment-client	2015-11-17 09:32:22 -08:00
ZappoMan	f712fae4d2	more hacking	2015-11-17 08:56:21 -08:00
Brad Hefta-Gaub	5f04e4a167	more work	2015-11-16 19:29:54 -08:00
samcake	8553033d59	Refactoring the mess for the Agent	2015-11-16 19:27:28 -08:00
Brad Hefta-Gaub	1e0b66a68f	more work	2015-11-16 19:23:39 -08:00
Brad Hefta-Gaub	12f206e2f0	more work on messages	2015-11-16 17:00:03 -08:00
Stephen Birarda	aa77c4894c	add an AudioInjectorManager for more efficient threading	2015-11-16 16:04:10 -08:00
Brad Hefta-Gaub	d42a1a721f	first cut at messages-mixer	2015-11-16 15:26:17 -08:00
Stephen Birarda	3fa0bcbcd9	ping the AssetClient from the agent	2015-11-16 10:38:59 -08:00
Stephen Birarda	5908f2d398	put Agent AssetClient on sep thread, cleanup	2015-11-16 10:38:45 -08:00
Stephen Birarda	d941be8d0b	allow assignment client to use AssetClient for ATP downloads	2015-11-16 10:38:33 -08:00
Stephen Birarda	8dcf245b74	Merge pull request #6395 from hyperlogic/tony/avatar-mixer-identity-fixes AvatarMixer: remove redundant identity packet send	2015-11-16 10:35:42 -08:00
Anthony J. Thibault	7aefc5c9f7	AvatarMixer: remove redundant identity packet send Removed AvatarClientData::checkAndSetHasReceivedFirstPackets boolean. This is handled by the AvatarClientData::checkAndSetHasReceivedFirstPacketsFrom set.	2015-11-16 10:14:28 -08:00
Clément Brisset	b795b66b35	Merge pull request #6365 from sethalves/rework-visual-physics-debug grab fix + physics logging/debug changes	2015-11-16 09:06:05 -08:00
Seth Alves	89ed3751ae	Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug	2015-11-14 14:00:20 -08:00
Anthony J. Thibault	245150333b	Fix for missing avatars on entry This should fix the issue where a persons avatar was occasionally not visible to others for a long period of time. This was due to several factors: 1) When a new avatar was added to the simulation that identity packet was not broadcast to other avatars on the server. This would rely on random logic to send the identity eventually. This is fixed in this PR, by sending identity packets to all other clients when a new clients arrive. 2) The random identity logic was not being executed if the sequence number check caused an update to be skipped. This means the probability of sending a random packet was reduced significantly, especially for clients that were loading geometry on entry. This was fixed by doing the random check before sequence number check. 3) The 1/300 probably used in the check was too low, this was only a 63% chance of sending a identity packet within 5 seconds. This was fixed by changing the probability to 1/187, which is a 80% chance to send an identity packet within 5 seconds. 4) The randFloat() implementation slightly reduced the identity packet probability due to quantization errors. This has been replaced by a C++ std random number generator.	2015-11-13 18:08:18 -08:00
Stephen Birarda	e263453acb	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-13 14:48:26 -08:00
Brad Hefta-Gaub	b6b5a5b1c2	add comment	2015-11-12 18:28:08 -08:00
Brad Hefta-Gaub	ecaa50c0ff	fix for infinite loop in erase entities special packet	2015-11-12 18:25:18 -08:00
Brad Hefta-Gaub	83e7eb58b9	add special packets and nack packets to outbound stats	2015-11-12 16:36:06 -08:00
Seth Alves	a78b1619be	Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug	2015-11-12 14:20:23 -08:00
Brad Hefta-Gaub	14a6e1fb6b	fix mac compiler error	2015-11-12 13:24:25 -08:00
Brad Hefta-Gaub	66a2b38f50	switch various status to use thread safe atomics	2015-11-12 13:09:51 -08:00
Stephen Birarda	ef778c554c	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-12 10:40:51 -08:00
Seth Alves	3519dd248b	Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug	2015-11-12 09:53:11 -08:00
Brad Davis	f521be10fe	Avatar recording work in progress	2015-11-12 00:33:38 -08:00
Brad Hefta-Gaub	80e15fb77d	reduce client to server to client entity edit latency	2015-11-11 17:03:21 -08:00
Seth Alves	be86748200	oops	2015-11-11 16:38:28 -08:00
Seth Alves	cffe4551dd	merge from upstream	2015-11-11 16:15:07 -08:00
Brad Hefta-Gaub	2f903a9513	CR feedback and some cleanup	2015-11-11 14:21:14 -08:00
Brad Hefta-Gaub	bdfe304f7a	remove some logging	2015-11-11 14:08:15 -08:00
Brad Hefta-Gaub	866116d285	more debugging	2015-11-11 12:13:47 -08:00
Brad Hefta-Gaub	006a1d60c8	keep some additional erase entities history and send to viewers	2015-11-10 15:31:51 -08:00
Seth Alves	5e4f30b2bb	improve terse entity logging. change how action data sending is triggered	2015-11-10 13:58:09 -08:00
Atlante45	6a53021818	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-09 13:23:31 -08:00
Howard Stearns	619746676b	Fix ScriptAvatar (ac agent), and provide a simple working example assignment client script.	2015-11-06 15:31:03 -08:00
Atlante45	55c6706f76	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-06 13:31:39 -08:00
Howard Stearns	aa1289bd7c	Update agent's outgoing avatar data packet with sequenceNumber as is now used in interface's MyAvatar.	2015-11-05 15:53:46 -08:00
Ryan Huffman	f4531759be	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-02 12:27:08 -08:00
Ryan Huffman	7f4a8e9d7d	Merge branch 'master' of github.com:Atlante45/hifi into baseball	2015-11-02 12:25:51 -08:00
Seth Alves	3ac0fef1ea	merge from upstream	2015-11-01 15:22:57 -08:00
Anthony J. Thibault	f50e1a0977	Fix for rare crash in LogHandler::flushRepeatedMessages() This can happen when LogHandler::flushRepetedMessages is called on the main thread, while the application is printing messages on a separate thread. The access to the _lastRepeatedMessage QHash was not guarded. I've added two mutexes to guard access to both the repeatedMessage hashes/regexes and the onlyOnceMessages/regexes. This will unfortunately incur a performance hit for frequent debug logging, but that's better then crashing. Also, I've added the ability to print threadIDs as well as Process ids. This is helpful when debugging multi-threaded access to shared variables.	2015-10-30 17:18:37 -07:00
Brad Davis	49e7d42c2c	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-30 10:07:40 -07:00
Stephen Birarda	3fa4f7138a	add more sounds to the crowd, ping AssetServer from Agent	2015-10-27 10:58:31 -07:00
black plastick	d34fc35544	added AvatarList.avatarSessionChanged(sessionUUID, oldUUID) for AC scripts.	2015-10-27 08:11:20 -04:00
Stephen Birarda	f275d2678d	ping the AssetClient from the agent	2015-10-26 16:06:12 -07:00
Stephen Birarda	6080654d7e	zero out the pre-mix samples for each stream	2015-10-26 15:48:05 -07:00
black plastick	f5d12ee2c6	Added AvatarList script events for assigment client scripts: AvatarList.avatarAddedEvent(sessionUUID); AvatarList.avatarRemovedEvent(sessionUUID);	2015-10-26 17:46:08 -04:00
Stephen Birarda	ca60ce59f1	put Agent AssetClient on sep thread, cleanup	2015-10-26 12:06:28 -07:00
Seth Alves	d86d69aeba	keep track of children. use local position and orientation on the wire.	2015-10-22 15:36:03 -07:00
Seth Alves	264b658132	hook up entities and avatars to SpatialParentFinder	2015-10-22 11:05:48 -07:00
Stephen Birarda	014e62e25a	allow assignment client to use AssetClient for ATP downloads	2015-10-20 17:11:37 -07:00
Brad Davis	5bac1aae2d	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-16 17:23:30 -07:00
Ryan Huffman	9ddcfdf94d	Cleanup PacketReceier and ReceivedMessage	2015-10-16 09:21:10 -07:00
Stephen Birarda	e5825daa57	Merge pull request #6090 from ZappoMan/fixStat Add some additional stats for debugging edit lags	2015-10-15 16:00:29 -07:00
Brad Hefta-Gaub	3718149157	include inbound queue PPS stats in server stats page	2015-10-15 15:49:12 -07:00
Brad Hefta-Gaub	e1570e3197	include inbound queue PPS stats in server stats page	2015-10-15 15:31:52 -07:00
Brad Hefta-Gaub	82a211174b	added packet recieved,lost,recovered stats to detailed server stats page	2015-10-15 15:23:12 -07:00
Ryan Huffman	7682ab00e3	Add ReceivedMessage and receive progress	2015-10-15 14:09:53 -07:00
Andrew Meadows	3d17c57910	Merge pull request #6083 from sethalves/groundwork-for-hold-action-changes Groundwork for hold action changes	2015-10-15 13:30:02 -07:00
Brad Davis	80c962a4cc	Merge remote-tracking branch 'upstream/master' into HEAD	2015-10-15 12:27:53 -07:00
Andrew Meadows	2ae62de84e	Merge pull request #6026 from birarda/qt-polling-env set bearer poll timeout env for wlan scan in Qt 5.5	2015-10-15 09:58:32 -07:00
Brad Davis	10df0f2d8c	Fix broken assignment-client build	2015-10-14 17:07:10 -07:00
Seth Alves	9a2aa9a337	locking	2015-10-14 13:40:20 -07:00
Seth Alves	9a9e5b962e	make edit logging terse vs not a domain-server setting	2015-10-14 09:45:35 -07:00
Seth Alves	2ecb7e8d29	fix bug that was making action deletes fail	2015-10-13 16:19:12 -07:00
Brad Davis	6f5f6450df	Cleanup CMake files	2015-10-11 00:01:03 -07:00
Ryan Huffman	f1babb7fa0	Fix bug in OctreeInboundPacketProcessor where node can be null	2015-10-09 09:21:36 -07:00
Stephen Birarda	1cd76bb937	fix for registration of meta types in Socket	2015-10-08 18:17:24 -07:00
Stephen Birarda	7987595dcd	set the bearer poll timeout for wlan scan in Qt 5.5	2015-10-08 11:32:10 -07:00
Brad Hefta-Gaub	7a85e5b7a7	rename frameIndex to currentFrame	2015-10-07 13:02:58 -07:00
Stephen Birarda	0db88ba572	fix a typo in comment	2015-10-06 15:06:28 -07:00
Stephen Birarda	4c695b179a	remove out of order assert in avatar-mixer	2015-10-06 15:04:48 -07:00
Stephen Birarda	593153deec	add receive rate and inbound kbps to av stats	2015-10-06 14:58:51 -07:00
Stephen Birarda	9bc95a0fc1	fix override warnings in assignment-client	2015-10-05 15:17:10 -07:00
Anthony J. Thibault	fc7b6dee84	Merge branch 'master' into transmit-joint-translation	2015-10-02 11:40:33 -07:00
Anthony J. Thibault	fa864d29f9	Merge branch 'master' into transmit-joint-translation	2015-10-01 16:55:24 -07:00
Howard Stearns	73e81d1da5	Merge pull request #5966 from ZappoMan/fixScriptStopAgentCrash real fix for crashing avatar agents	2015-09-30 17:45:41 -07:00
Brad Hefta-Gaub	c01077a0d7	real fix	2015-09-30 17:30:34 -07:00
Ryan Huffman	23b057cbb2	Merge pull request #5961 from ZappoMan/fixScriptStopAgentCrash possible fix for crashing agents acting like avatars	2015-09-30 16:24:41 -07:00
Brad Hefta-Gaub	42d9045770	possible fix for crashing agents acting like avatars	2015-09-30 16:02:33 -07:00
Ryan Huffman	2dc0d68f0f	Merge pull request #5960 from ZappoMan/fixScriptStopAgentCrash fix possible crash in agent	2015-09-30 15:49:06 -07:00
Brad Hefta-Gaub	34dc8bdbcb	fix possible crash in agent	2015-09-30 15:34:35 -07:00
Ryan Huffman	0063eee4a0	Fix issue with nackPacketList being accessed after being moved	2015-09-30 15:02:45 -07:00
Seth Alves	50dd8eba45	Relay joint translations across network. Apply animation's root-joint translation to avatar.	2015-09-26 11:40:39 -07:00
Stephen Birarda	229e73f88c	protect the agent from null timers in avatar stop	2015-09-16 11:52:05 -07:00
Stephen Birarda	bca00db4a8	use unique_ptr for Agent ScriptEngine	2015-09-16 11:48:15 -07:00
Stephen Birarda	5df7ce7424	fix for missing jurisdiction listener in Agent	2015-09-16 11:43:54 -07:00
Brad Hefta-Gaub	0aed08a006	more robust handling of readConfiguration	2015-09-15 16:52:15 -07:00
Brad Hefta-Gaub	4a24a3767b	couple of entity server corner cases	2015-09-15 16:17:05 -07:00
Brad Hefta-Gaub	22b979a663	couple of entity server corner cases	2015-09-15 16:02:22 -07:00
Brad Hefta-Gaub	bdae3e420b	fix crash in AC	2015-09-15 11:24:04 -07:00
Brad Hefta-Gaub	54a45f3173	Merge branch 'master' of https://github.com/highfidelity/hifi into scriptEngineCleanup Conflicts: libraries/entities-renderer/src/EntityTreeRenderer.cpp libraries/script-engine/src/ScriptEngine.cpp libraries/script-engine/src/ScriptEngine.h	2015-09-14 21:13:08 -07:00
Brad Hefta-Gaub	94b273a029	more work on script engine	2015-09-14 20:59:10 -07:00
Stephen Birarda	d189fb932f	Merge pull request #5785 from Atlante45/protocol Update AssetServer stats with units	2015-09-14 11:18:23 -07:00
Atlante45	1f46b90f9c	Remove constexpr for windows	2015-09-14 18:39:31 +02:00
Brad Hefta-Gaub	56118e4204	migrate Agent to use standard APIs of ScriptEngine	2015-09-11 22:12:42 -07:00
Brad Hefta-Gaub	54c56a92f1	move agent specific code out of ScriptEngine	2015-09-11 21:56:00 -07:00
Brad Hefta-Gaub	f85cb2c888	first cut at cleaning up ScriptEngine class	2015-09-11 19:12:09 -07:00
Brad Davis	9b81842850	Merge branch 'master' into homer Conflicts: assignment-client/src/octree/OctreeSendThread.cpp interface/src/Application.cpp libraries/entities-renderer/src/EntityTreeRenderer.cpp libraries/entities/src/EntityItem.cpp libraries/entities/src/EntityTree.cpp libraries/entities/src/EntityTreeElement.cpp libraries/entities/src/EntityTreeElement.h libraries/entities/src/EntityTreeHeadlessViewer.cpp libraries/entities/src/RecurseOctreeToMapOperator.cpp libraries/octree/src/Octree.h libraries/physics/src/EntityMotionState.cpp	2015-09-11 16:31:18 -07:00
Brad Davis	e458eb7ae9	Merge pull request #5734 from sethalves/octree-shared-pointers octree uses shared pointers	2015-09-11 16:00:04 -07:00
Atlante45	8ee56b59c9	Update AssetServer stats with units Also removed array for better layout	2015-09-11 22:33:58 +02:00
Brad Davis	244795b629	Merge branch 'homer' into temp Conflicts: interface/src/Application.cpp	2015-09-11 11:21:29 -07:00
Seth Alves	0e63147be2	Merge pull request #5776 from birarda/ac-pid-zero make sure AC process ID is valid before acting on the process	2015-09-11 10:00:08 -07:00
Atlante45	05df84ee67	Remove AS stats namespace/Filter DS	2015-09-11 15:20:01 +02:00
Atlante45	15f7745bcc	JSON stats reliable and ordered	2015-09-11 14:21:54 +02:00
Atlante45	801f32295d	Update JSON stats building	2015-09-11 14:21:54 +02:00
Atlante45	08e0a8d705	AssetServer JSON stats	2015-09-11 14:21:53 +02:00
Atlante45	5808658958	Make NodeJSONStats reliable	2015-09-11 14:21:53 +02:00
Brad Davis	aa989c3687	Fixing some entity race condition crashes	2015-09-10 20:53:17 -07:00
Stephen Birarda	d10095ed20	make sure AC PID is valid before acting on process	2015-09-10 16:55:25 -07:00
Seth Alves	7b656d5ead	make a couple variable names better	2015-09-09 03:30:09 -07:00
Seth Alves	9c4fdfd653	merge from upstream	2015-09-08 18:01:07 -07:00
Stephen Birarda	e1c395f5ea	resolve conflicts on merge with upstream/master	2015-09-08 14:56:23 -07:00
Seth Alves	31fcd55d47	octree uses shared pointers	2015-09-08 11:59:48 -07:00
Ryan Huffman	8fffb77f13	Add comment about byte range for ATP get asset request	2015-09-08 09:53:02 -07:00
Stephen Birarda	b2778bff09	fix a bad replacement for AC server hostname	2015-09-08 08:30:16 -07:00
Stephen Birarda	c49088846f	add an alias for AvatarDataSequenceNumber	2015-09-08 08:26:14 -07:00
Rudi Chen	b703ce01fb	Make sure libdl is linked after libcrypto. Fixes a `undefined reference to symbol 'dlclose@@GLIBC_2.2.5' error I was running into on Linux Mint 17.2.	2015-09-06 21:42:02 -04:00
Stephen Birarda	ed19987b7d	resolve conflicts on merge with upstream/master	2015-09-04 12:31:46 -06:00
Seth Alves	0c8848a463	don't update _lastSendJointData if we didn't send	2015-09-03 15:41:40 -07:00
Seth Alves	1071b98260	fix differential avatar-joint sending to work if more than 2 avatars are in the domain	2015-09-03 14:38:46 -07:00

... 13 14 15 16 17 ...

3002 commits