Commit graph

49997 commits

Author SHA1 Message Date
Zach Pomerantz
ca727b7920 inline audio mix helpers 2017-01-27 15:28:43 -05:00
Zach Pomerantz
c4190ad4c4 add hrtf adjustment to throttle gain appx 2017-01-27 15:26:49 -05:00
Zach Pomerantz
7bcf136dc9 modularize audio throttle gain appx 2017-01-27 15:26:32 -05:00
Zach Pomerantz
24ca765a39 add hrtf gain getter 2017-01-27 14:36:59 -05:00
Brad Hefta-Gaub
898c9b176d Merge pull request #9533 from zzmp/fix/sleep_until
Fix audio-mixer timing for WIN32
2017-01-27 11:35:02 -08:00
Zach Pomerantz
d82c8b251a use sleep_for to avoid WIN32 sleep_until bug 2017-01-27 13:22:50 -05:00
Chris Collins
5ed376afc9 Merge pull request #9257 from ZappoMan/tuneAvatarInfo
avatar mixer bandwidth optimization
2017-01-26 17:33:57 -08:00
Howard Stearns
866f9debcd Merge pull request #9526 from highfidelity/edit-entity-filter
Edit entity filter (from branch)
2017-01-26 16:00:48 -08:00
ZappoMan
af426063ac fix bad merge 2017-01-26 15:19:25 -08:00
Howard Stearns
d1a137cd18 Merge pull request #9518 from howard-stearns/entity-filter-resource
Entity filters by URL
2017-01-26 15:06:57 -08:00
ZappoMan
4c80422a73 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-26 14:34:58 -08:00
Chris Collins
c0ee091946 Merge pull request #9502 from zzmp/audio/throttle
Throttle audio with PI controller, by node
2017-01-26 14:25:44 -08:00
howard-stearns
f9f0a4ea2d fix startup-failure case 2017-01-26 14:05:16 -08:00
samcake
19858bda78 Merge pull request #9493 from AndrewMeadows/otherAvatars
optimize, prioritize, and timebox processing of avatar updates
2017-01-26 13:30:51 -08:00
samcake
52cbac0018 Merge pull request #9510 from jherico/sparse_size_estimation
Attempt to account for sparse texture memory overhead
2017-01-26 12:59:15 -08:00
Brad Hefta-Gaub
0582aca598 Merge pull request #9511 from kunalgosar/master
change server to default to not auto-muting
2017-01-26 10:59:50 -08:00
Brad Hefta-Gaub
0c9e42e2d9 Merge pull request #9486 from huffman/fix/overlay-parent-reg-point
Fix Overlay-as-child of model entity with reg point
2017-01-26 10:59:01 -08:00
Brad Hefta-Gaub
5ada689ab7 Merge pull request #9497 from ctrlaltdavid/fix-clara-download
Fix intermittent Clara.io download crashes
2017-01-26 10:58:27 -08:00
Andrew Meadows
5783db910b remove some unhelpful trace profiling data 2017-01-26 08:35:26 -08:00
Andrew Meadows
82f52b9658 fix bug: Avatar instance not getting deleted 2017-01-26 08:35:26 -08:00
Andrew Meadows
2264c29604 less magic 2017-01-26 08:35:26 -08:00
Andrew Meadows
0f09e60acd remove unhelpful comment 2017-01-26 08:35:26 -08:00
Andrew Meadows
01e14eec47 remove commented out cruft 2017-01-26 08:35:26 -08:00
Andrew Meadows
ac180758ad sort, optimize, and timebox process avatar updates 2017-01-26 08:35:26 -08:00
Andrew Meadows
d3dcc2b415 remove cruft: billboard option for Head::simulate() 2017-01-26 08:35:26 -08:00
Andrew Meadows
887707426e remove cruft: Head::getScalePivot() 2017-01-26 08:35:26 -08:00
Andrew Meadows
69a7b1ef76 move some stuff out of Avatar::simulate()
call it explicity in AvatarManager::updateOtherAvatars()
2017-01-26 08:35:26 -08:00
Andrew Meadows
b8afc87ad9 remove cruft 2017-01-26 08:35:26 -08:00
Andrew Meadows
e65d9309b3 remove cruft: Avatar::setShouldDie() 2017-01-26 08:35:26 -08:00
Andrew Meadows
e363423992 compute priority of avatar and sort before update 2017-01-26 08:35:26 -08:00
Andrew Meadows
09707217ec remove Model::simulateInternal() 2017-01-26 08:35:25 -08:00
Andrew Meadows
d8a10320d1 fix warning about implicit cast 2017-01-26 08:35:25 -08:00
Andrew Meadows
88bf126168 remove old avatar culling and LOD logic 2017-01-26 08:35:25 -08:00
Andrew Meadows
08bba5f45f add and remove some profile data points 2017-01-26 08:35:25 -08:00
ZappoMan
3c3dcbbbaa Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-26 08:20:03 -08:00
Howard Stearns
f36b968860 Merge branch 'edit-entity-filter' into entity-filter-resource 2017-01-25 19:39:12 -08:00
Howard Stearns
44f5510a2a Merge pull request #9517 from howard-stearns/edit-entity-filter
merge from master
2017-01-25 19:23:08 -08:00
Howard Stearns
a1afbe7d5e Merge branch 'master' of https://github.com/highfidelity/hifi into edit-entity-filter 2017-01-25 19:16:29 -08:00
howard-stearns
4437063a3a remove logging, now that we have error logging 2017-01-25 17:04:09 -08:00
howard-stearns
1c30da42af change placeholder text in settings 2017-01-25 17:01:07 -08:00
howard-stearns
9cbc4fd1b9 Merge branch 'master' of https://github.com/highfidelity/hifi into entity-filter-resource 2017-01-25 16:23:52 -08:00
howard-stearns
b62f3e550a error check/log on execution, too 2017-01-25 16:23:07 -08:00
Stephen Birarda
42083a1a6d Merge pull request #9457 from Atlante45/entity-script-server
Entity script server
2017-01-25 15:37:27 -08:00
howard-stearns
34e9c5debc initial script error checking 2017-01-25 14:56:06 -08:00
howard-stearns
df91ef5f5f blocking fetch of http scripts 2017-01-25 14:22:42 -08:00
Clément Brisset
3f34a9e832 Merge pull request #40 from birarda/entity-script-server
hack to accept possibly newer server scripts
2017-01-25 13:21:45 -08:00
Zach Pomerantz
fb31254f57 add proportional term to audio-mixer throttling controller 2017-01-25 21:18:03 +00:00
Zach Pomerantz
46afa7e764 DRY audio-mixer all-stream mixes 2017-01-25 21:18:03 +00:00
Zach Pomerantz
1153c1900f reorder AudioMixerSlave::prepareMix to be sequential 2017-01-25 21:18:03 +00:00
Zach Pomerantz
66c82f3193 clean AudioMixerSlave::addStreamToMix 2017-01-25 21:18:03 +00:00