Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-19 02:41:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
54666 commits 72 branches 59 tags 1.2 GiB
Commit graph

2604 commits

Author SHA1 Message Date
Stephen Birarda
f213b32167 clear the entity viewer before restarting ESS script engine 2017-02-26 09:38:51 -08:00
Brad Hefta-Gaub
60fd4afc4d don't count NoData avatars as having been broadcast, fix avatars slightly out of view from freezing 2017-02-23 18:52:10 -08:00
Andrew Meadows
92a32b4651 remove unused variable 2017-02-23 17:36:45 -08:00
Andrew Meadows
e54812430e avoid unnecessary copy of priority_queue 2017-02-23 17:36:45 -08:00
Brad Hefta-Gaub
1e91f74ce7 clean up some uneedded nullptr checks, make them asserts 2017-02-23 13:32:35 -08:00
Brad Hefta-Gaub
8cb8d686ec more cleanup and some CR feedback fixes 2017-02-23 13:09:39 -08:00
Brad Hefta-Gaub
f61e16fccf more aggressive out of view data culling 2017-02-23 11:01:55 -08:00
Brad Hefta-Gaub
dde9640c66 remove old full rate distance code 2017-02-23 10:29:17 -08:00
Brad Hefta-Gaub
d4adee8b38 add over bandwidth exit to sorted avatar loop 2017-02-23 00:15:07 -08:00
Brad Hefta-Gaub
40037bee55 added some stats for the random drops 2017-02-22 23:28:40 -08:00
Brad Hefta-Gaub
06f0087459 wire up radius properly 2017-02-22 22:36:37 -08:00
Brad Hefta-Gaub
edf7c016a1 more cleanup 2017-02-22 22:06:28 -08:00
Brad Hefta-Gaub
4c4506b1f7 some cleanup 2017-02-22 21:47:40 -08:00
Brad Hefta-Gaub
05995163cf add support for tuning sorting 2017-02-22 09:49:47 -08:00
David Kelly
397eb89c14 compiler warning - odd 2017-02-22 08:38:49 -08:00
Brad Hefta-Gaub
4c42e95607 add some debugging 2017-02-22 08:13:37 -08:00
David Kelly
6d7fab4053 Agent Avatars sending loudness in AvatarData 2017-02-21 16:59:08 -08:00
Brad Hefta-Gaub
8cc0b383c4 wire up bandwidth buget to sorting 2017-02-21 16:22:22 -08:00
Brad Hefta-Gaub
a58ddad3aa Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements 2017-02-21 14:36:03 -08:00
Brad Hefta-Gaub
2017ea4491 hacking on using sorted avatars for bandwidth budget 2017-02-21 14:18:00 -08:00
Stephen Birarda
10828d7534 Merge pull request #9692 from birarda/feat/es-get-children-parents 
Give implicit access to family tree of server scripted entities in ESS
 2017-02-21 13:17:46 -08:00
Brad Hefta-Gaub
942c5689fc more comment cleanup 2017-02-18 14:09:47 -08:00
Brad Hefta-Gaub
73d64120df removed dead comment 2017-02-18 14:08:03 -08:00
Brad Hefta-Gaub
bc858f82fc fixed a FIXME comment 2017-02-18 14:07:20 -08:00
Brad Hefta-Gaub
2b79602220 debug cleanup 2017-02-18 13:14:14 -08:00
Brad Hefta-Gaub
e95e7f663c more cleanup 2017-02-18 13:04:00 -08:00
Brad Hefta-Gaub
66a6666b52 more cleanup, improved stats, port throttling 2017-02-18 12:29:01 -08:00
Brad Hefta-Gaub
71af81851e migrate to new style throttling 2017-02-17 22:20:32 -08:00
Brad Hefta-Gaub
d233430809 fix warnings 2017-02-17 21:58:35 -08:00
Brad Hefta-Gaub
4570b3439d some cleanup 2017-02-17 21:38:30 -08:00
Brad Hefta-Gaub
c2c843d841 fix mac warnings 2017-02-17 21:05:02 -08:00
Brad Hefta-Gaub
291b823cfa const cleanup and fix crash 2017-02-17 18:28:07 -08:00
Brad Hefta-Gaub
92ca7de0bf some tweaks to support too large avatar data 2017-02-17 10:12:35 -08:00
Brad Hefta-Gaub
78147c27ad log too large byteArray instead of crashing 2017-02-17 08:33:27 -08:00
Brad Hefta-Gaub
3a0c63cbc7 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements 
Conflicts:
	assignment-client/src/avatars/AvatarMixer.cpp
 2017-02-16 18:14:52 -08:00
Howard Stearns
7afd13d2cb Merge pull request #9693 from howard-stearns/fix-requestsDomainListData 
fix rquestsDomainListData
 2017-02-16 17:06:29 -08:00
Brad Hefta-Gaub
be12a8ffa4 stats cleanup 2017-02-16 16:58:06 -08:00
Stephen Birarda
9f9fc03751 call EntityTree update when ScriptEngine update occurs 2017-02-16 16:46:09 -08:00
Stephen Birarda
4ece56b673 spacing cleanup in EntityTreeSendThread 2017-02-16 16:46:09 -08:00
Stephen Birarda
fe11a945ef remove debug from EntityTreeSendThread 2017-02-16 16:46:09 -08:00
Stephen Birarda
9d336a84ab force a full scene send for new ancestors/descendants 2017-02-16 16:46:09 -08:00
Stephen Birarda
a3883a746c add the basic structure for inclusion of ancestors/descendants in ESS queries 2017-02-16 16:46:09 -08:00
Ryan Huffman
0da81efd93 Add includeDescendants and includeParents to ESS entity query 2017-02-16 16:46:09 -08:00
howard-stearns
04712e3744 fix rquestsDomainListData 2017-02-16 16:43:16 -08:00
Brad Hefta-Gaub
ece32a3c68 cleanup 2017-02-16 16:19:40 -08:00
Brad Hefta-Gaub
df54762da9 add some more stats 2017-02-16 15:56:02 -08:00
Brad Hefta-Gaub
d49c83cac3 fix build buster, some tweaks 2017-02-16 14:19:14 -08:00
Zach Pomerantz
07e97a0cab unqueue from front for audio packets 2017-02-16 21:40:53 +00:00
Brad Hefta-Gaub
d532b3a4b8 more work on multi-core 2017-02-16 13:25:51 -08:00
Brad Hefta-Gaub
0a48ea75a7 fix unix build error 2017-02-16 10:45:58 -08:00
Brad Hefta-Gaub
755c690030 some cleanup, better sleep management 2017-02-16 10:07:49 -08:00
humbletim
b15956278c separate out supporting changes into 21114-part2 branch 2017-02-16 07:40:19 -05:00
Brad Hefta-Gaub
23790b93e3 first cut at slaves doing broadcast 2017-02-16 01:07:21 -08:00
Brad Hefta-Gaub
2d300a6643 checkpoint with eachNode() changed to nestedEach() 2017-02-15 22:14:26 -08:00
Brad Hefta-Gaub
d22f4c1dd7 partial const migration work so mixer will not side-effect AvatarData 2017-02-15 21:29:03 -08:00
Brad Hefta-Gaub
bd72216574 add support for multiple jobs types on the slave pool 2017-02-15 20:49:45 -08:00
Brad Hefta-Gaub
faa8e629a0 checkpoint 2017-02-15 20:28:32 -08:00
Brad Hefta-Gaub
5d90b7b1b7 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements 2017-02-15 16:15:57 -08:00
Zach Pomerantz
a976d191ad Merge pull request #9679 from zzmp/fix/audio-assert-ignore-memoization 
Loosen audio memoization precondition
 2017-02-15 17:50:33 -05:00
Brad Hefta-Gaub
babeabede5 more cleanup and stats rework 2017-02-15 13:49:16 -08:00
Brad Hefta-Gaub
00086fcc06 wire up thread count to settings, tweak stats 2017-02-15 13:00:30 -08:00
Brad Hefta-Gaub
cddb72bbd7 clean up stats, add slave stats 2017-02-15 12:11:17 -08:00
David Kelly
5184cbe615 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2 2017-02-15 12:08:55 -07:00
Zach Pomerantz
2e9217fb47 loosen audio memoization precondition 2017-02-15 13:36:03 -05:00
Brad Hefta-Gaub
4f655bba3f more hacking 2017-02-15 09:29:45 -08:00
Brad Hefta-Gaub
67e6d654d9 introducing AvatarMixerSlavePool concept 2017-02-14 15:32:32 -08:00
Brad Hefta-Gaub
9699c3b714 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements 2017-02-14 14:12:28 -08:00
Brad Hefta-Gaub
3d874f6ad2 more hacking 2017-02-14 14:12:22 -08:00
Zach Pomerantz
09cc4bf48d time events with packets 2017-02-14 21:48:36 +00:00
Zach Pomerantz
41a4ec4200 mv codec init to ctor from negotiateCodecs 2017-02-14 21:26:35 +00:00
Zach Pomerantz
06c8fba35d mv Node out of packet queue 2017-02-14 21:10:30 +00:00
Zach Pomerantz
a7386392a1 fix codec parsing 2017-02-14 20:46:27 +00:00
Zach Pomerantz
b102c2d1d0 generalize audio thread pool to processPackets 2017-02-14 20:46:27 +00:00
Zach Pomerantz
7d8a947e6d add node-isolated packet parsing to client data 2017-02-14 20:46:27 +00:00
Zach Pomerantz
da5a89f582 move codec negotiation to client data 2017-02-14 20:46:27 +00:00
Zach Pomerantz
481cd0ca6a move audio packets to client data 2017-02-14 20:46:27 +00:00
Zach Pomerantz
2f457ae891 add packet queue to AudioMixerClientData 2017-02-14 20:46:27 +00:00
David Kelly
342584b2a8 Filter failure mode updated 
The decision here is that all failed filters (syntax errors, 404s,
bad urls etc...) lock out all edits for those without lock rights.
If it is the domain-wide one, then that applies to entire domain.
If a zone filter, then that applies to all edits in that zone.

Also - zone filters don't apply to the zone itself.  Other zone filters
whose zones lie within that zone _do_ apply, in addition to the global
one.
 2017-02-14 13:05:12 -07:00
Seth Alves
2e2a3c60d0 Merge branch 'master' of github.com:highfidelity/hifi into avatar-as-child-fixes 2017-02-14 06:26:20 -08:00
Ken Cooke
bf077e6fdb Merge pull request #9623 from zzmp/audio/should-ignore 
Optimize ignore zone checks for audio mixer
 2017-02-14 06:18:54 -08:00
Brad Hefta-Gaub
e642f6f96a add some various debug and stats code to avatarMixer 2017-02-13 18:29:45 -08:00
Brad Hefta-Gaub
b48ff6f24f add some various debug and stats code to avatarMixer 2017-02-13 18:17:01 -08:00
Seth Alves
3d7633a11f Merge branch 'master' of github.com:highfidelity/hifi into avatar-as-child-fixes 2017-02-13 13:44:05 -08:00
Brad Hefta-Gaub
ced6f43923 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements 2017-02-13 13:09:54 -08:00
Brad Hefta-Gaub
d24ed62116 Merge pull request #9660 from zzmp/audio/silent-stats 
Add silent_packets stat to audio mixer
 2017-02-13 13:07:07 -08:00
Zach Pomerantz
e1cf04e0f0 add silent_packets stat to audio mixer 2017-02-13 20:18:16 +00:00
David Kelly
590cf6d798 whitespace 2017-02-13 12:20:47 -07:00
David Kelly
92ee823ef3 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2 2017-02-13 10:22:42 -07:00
Seth Alves
1164a1b3bf some fixes for when an avatar is a child of something else 2017-02-12 08:27:39 -08:00
Brad Hefta-Gaub
8ed69f62fa adjust stats so avatar list is at bottom 2017-02-10 18:22:02 -08:00
Brad Hefta-Gaub
e6142d9719 Merge pull request #9645 from ZappoMan/binaryDataOverMessages 
implement support for binary data over messages
 2017-02-10 15:12:56 -08:00
David Kelly
2996298e79 First bit of cleanup 
consolidate to one map, some minor other cleaning.  More coming.
 2017-02-10 14:57:09 -07:00
David Kelly
cf780b3b73 fixed persist issue, working much better 2017-02-10 11:42:56 -07:00
Ken Cooke
542a668723 Merge pull request #9641 from zzmp/load/test 
log AVX2 support in audio-mixer
 2017-02-10 08:13:20 -08:00
Brad Hefta-Gaub
6a4f66677e Merge branch 'master' of https://github.com/highfidelity/hifi into binaryDataOverMessages 2017-02-09 21:10:10 -08:00
Brad Hefta-Gaub
987f147ed4 implement support for binary data over messages 2017-02-09 20:41:34 -08:00
David Kelly
5ca80803c0 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2 2017-02-09 20:01:43 -07:00
David Kelly
8d666854c7 working it seems 
But, AABox for zones isn't very helpful (box is _small).  Time to use
the shape of the zone.
 2017-02-09 15:39:38 -07:00
Atlante45
3a30de79aa CR 2017-02-09 13:04:43 -08:00
Atlante45
72ed1add94 CR log spam cleanup 2017-02-09 13:04:43 -08:00
Atlante45
6fbe3c9187 Windows specific changes 2017-02-09 13:04:43 -08:00
Atlante45
0f39356e94 Only users with perm rez can see the log 2017-02-09 13:04:43 -08:00
Atlante45
191121888c Add log window to the ESS log 2017-02-09 13:04:43 -08:00
Atlante45
fcb74bce10 First draft for entity script server log streaming 2017-02-09 13:04:43 -08:00
Zach Pomerantz
9d830d7ea9 log AVX2 support in audio-mixer 2017-02-09 18:56:49 +00:00
Ryan Huffman
026c68c7de Merge pull request #9625 from huffman/fix/server-script-entity-updates 
Fix Server Entity Script w/ high update rate causing issues
 2017-02-09 10:07:32 -08:00
Brad Hefta-Gaub
b399420190 CR 2017-02-08 15:42:59 -08:00
David Kelly
ff7c9d3546 Working like before 
Single entity script running properly.  Now, need to add the zone
filters and execute them.
 2017-02-08 15:36:16 -07:00
Brad Hefta-Gaub
07cf87749f Merge branch 'master' of https://github.com/highfidelity/hifi into betterBots 2017-02-08 13:41:33 -08:00
Brad Hefta-Gaub
9d3c674271 fix warning 2017-02-08 13:41:09 -08:00
Ryan Huffman
f75eceda65 Add entity PPS per script configuration 2017-02-08 13:11:18 -08:00
Brad Hefta-Gaub
eedfc4fd38 fix various bot related bugs 2017-02-08 12:35:00 -08:00
Zach Pomerantz
553fffd8ae time mix instead of throttle with HIFI_AUDIO_MIXER_DEBUG 2017-02-07 21:49:23 +00:00
Zach Pomerantz
ee699d3fa6 Revert 'use tbb::atomic for cp' 2017-02-07 20:40:06 +00:00
Zach Pomerantz
5e9fb17949 use tbb::atomic for cp 2017-02-07 15:01:23 -05:00
Zach Pomerantz
ad7c01e86e modularize audio ignore zone computations 2017-02-07 15:01:22 -05:00
Zach Pomerantz
308e3cab71 fix memoized ignoreZone assertion for initialization 2017-02-07 15:01:22 -05:00
Zach Pomerantz
d42b6a64c4 use threadsafe map for audio node ignore cache 2017-02-07 15:01:22 -05:00
Zach Pomerantz
4bcc9d3072 bail audio mix if node is not initialized 2017-02-07 15:01:22 -05:00
Zach Pomerantz
093f748d7d make auto stream explicit 2017-02-07 15:01:22 -05:00
Zach Pomerantz
e7cf84324b abstract audio ignore caching 2017-02-07 15:01:22 -05:00
Zach Pomerantz
207d2e78f0 fix should ignore opts 2017-02-07 15:01:21 -05:00
Zach Pomerantz
310c8b18ee add caching over symmetric nodes for audio shouldIgnore 2017-02-07 15:01:21 -05:00
Zach Pomerantz
8a42755e8f mv shouldIgnore from AudioMixerSlave to ClientData 2017-02-07 15:01:21 -05:00
Zach Pomerantz
3c1cf504d0 rename getIgnoreBox to getIgnoreZone to prevent confusion 2017-02-07 15:01:21 -05:00
Zach Pomerantz
9bcc5c95b4 reduce stream lock usage in AudioMixerClientData::getIgnoreBox 2017-02-07 15:01:21 -05:00
Zach Pomerantz
569ae113a0 memoize audio ignore box in AudioMixerClientData 2017-02-07 15:01:21 -05:00
Zach Pomerantz
ff56eb24c8 Merge pull request #9537 from zzmp/audio/throttle-filter 
Add injector/avatar attenuation to audio-mixer throttling
 2017-02-07 20:57:43 +01:00
Ryan Huffman
534d3c581c Update EntityEditSender PPS to be 3000 in ESS 2017-02-07 11:50:44 -08:00
Zach Pomerantz
9b0190f1cf add ns/throttle to audio mixer debug stats 2017-02-06 20:31:19 +00:00
howard-stearns
8b44e83d9e Add new EntityPhysics packet type. 2017-02-06 11:11:18 -08:00
Zach Fox
4af5118654 First pass 2017-02-01 17:04:21 -08:00
Zach Pomerantz
1f56814714 Merge branch 'master' of https://github.com/highfidelity/hifi into audio/throttle-filter 2017-01-31 19:35:27 +00:00
howard-stearns
93414d802d fetch entity filter script asynchronously (but reject edits while waiting) 2017-01-30 11:06:36 -08:00
Zach Pomerantz
eb00c7ba11 group constants in audio mixer gain computation 2017-01-30 17:48:03 +00:00
Ken Cooke
ae8d0d1948 Merge pull request #9527 from thoys/fix-ac-playback-audio 
Fix AC recording playback audio encoding
 2017-01-28 17:43:28 -08:00
howard-stearns
673ac5680f add debug logging to entity server startup in the case of having a filter 2017-01-27 15:40:17 -08:00
Zach Pomerantz
e7e550d78c add injector attenuation to audio gain appx 2017-01-27 16:18:10 -05:00
Zach Pomerantz
2da4dce8be rm statics from audio-mixer mixing 2017-01-27 15:46:25 -05:00
Zach Pomerantz
fe1847f965 clean up audio-mixer computeGain helper 2017-01-27 15:46:12 -05:00
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
Thijs Wenker
a2da1e3dc1 Merge branch 'master' into fix-ac-playback-audio 2017-01-27 21:00:57 +01: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
Thijs Wenker
cdc0f3ddd2 - make AC recording audio play with right encoding 
- spelling fix
 2017-01-27 01:19:11 +01: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
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