Commit graph

11069 commits

Author SHA1 Message Date
Stephen Birarda
c0da215a60 correctly output trailing sleep time 2014-03-24 10:39:10 -07:00
Stephen Birarda
d0fbf4953a change back off strategy, output trailing sleep 2014-03-24 10:27:46 -07:00
Philip Rosedale
321930cec8 Merge pull request #2454 from birarda/audio-scaling
change audio-mixer cutoff scaling to be exponential
2014-03-24 09:43:22 -07:00
Stephen Birarda
5567d9acb9 change audio-mixer struggle behaviour 2014-03-24 09:24:13 -07:00
Philip Rosedale
66b863eea8 Merge pull request #2451 from ZappoMan/windows_fixes
Windows run time fixes
2014-03-23 19:01:11 -07:00
ZappoMan
bde2146b1b whitespace cleanup 2014-03-23 18:14:36 -07:00
ZappoMan
d63acfc46f revert 2014-03-23 18:12:02 -07:00
ZappoMan
d962387c75 revert 2014-03-23 18:11:40 -07:00
ZappoMan
9c7ffffbae fix some windows issues
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
2014-03-23 18:10:22 -07:00
Brad Hefta-Gaub
5249a97697 Merge pull request #2447 from birarda/master
remove an unused variable
2014-03-22 13:07:59 -07:00
Leonardo Murillo
98041b1156 Trivial commit - testing build on new server 2014-03-21 22:05:56 -06:00
Stephen Birarda
c5b0288c12 remove numClientsMixedInFrame since it is no longer used 2014-03-21 18:49:46 -07:00
Stephen Birarda
9e39c65d1c Merge pull request #2446 from birarda/master
fix a boneheaded mistake in trailing average for AudioRingBuffer loudness
2014-03-21 18:45:42 -07:00
Stephen Birarda
af4fb26031 floats are important 2014-03-21 18:44:59 -07:00
Stephen Birarda
e10813dcab Merge pull request #2445 from birarda/master
fix for trailing average on ring buffer
2014-03-21 18:28:29 -07:00
Stephen Birarda
abd6c8a747 fix trailing average on ring buffer, remove unused constant 2014-03-21 18:28:12 -07:00
Brad Hefta-Gaub
89ba7f00f0 Merge pull request #2444 from ZappoMan/domainchangebug
kill local voxels on domain change
2014-03-21 18:20:38 -07:00
Stephen Birarda
6e83a939f9 Merge pull request #2443 from birarda/master
fix div by zero and output number of clients mixed in last frame
2014-03-21 18:18:06 -07:00
Stephen Birarda
88348b12d2 fix a divide by zero and output number of clients mixed in last frame 2014-03-21 18:16:47 -07:00
ZappoMan
c70bbda10a kill local voxels on domain change 2014-03-21 18:16:28 -07:00
Stephen Birarda
42de3047ab Merge pull request #2442 from birarda/master
change delta to 2%, don't hit 1 for cutoff
2014-03-21 17:17:47 -07:00
Stephen Birarda
88b91b9eb7 change an int to a float 2014-03-21 17:17:11 -07:00
Stephen Birarda
8ecd9aa0c0 change audibility delta to 2%, don't hit 1.0 2014-03-21 17:16:54 -07:00
Stephen Birarda
e3b65f4949 Merge pull request #2441 from birarda/master
linear change to audability ratio
2014-03-21 16:48:01 -07:00
Stephen Birarda
34f9075980 use a linear change to audability ratio 2014-03-21 16:47:41 -07:00
Stephen Birarda
949aefac62 Merge pull request #2439 from birarda/master
check for an audio cutoff change only every TRAILING_AVERAGE_FRAMES
2014-03-21 16:21:26 -07:00
Stephen Birarda
5fa26ee00c Merge pull request #2440 from ZappoMan/fixagentcrash
fix crash on domain restart in Agent, also have Agent properly shutdown on call to Script.stop()
2014-03-21 16:04:44 -07:00
Stephen Birarda
bad209bf09 use a trailing average for a quieter loudness 2014-03-21 15:53:00 -07:00
Stephen Birarda
dc2d050187 remove sleep time debug now that the audio-mixer reports struggle 2014-03-21 15:47:21 -07:00
ZappoMan
438e5bd235 fix crash on domain restart in Agent, also have Agent properly shutdown on call to Script.stop() 2014-03-21 15:46:06 -07:00
Stephen Birarda
50007d7f4b fix a debug message for audability threshold 2014-03-21 15:43:39 -07:00
Stephen Birarda
75bc640104 fix some indentation is audio mixer cutoff code 2014-03-21 15:42:58 -07:00
Stephen Birarda
4661553acb check for cutoff change only every TRAILING_AVERAGE_FRAMES 2014-03-21 15:40:08 -07:00
Brad Hefta-Gaub
c8ef3489d2 Merge pull request #2438 from Atlante45/inspect_js_fix
Inspect js fix
2014-03-21 15:27:04 -07:00
Stephen Birarda
4bde0e6844 Merge pull request #2436 from ZappoMan/vscrashfix
fixes to voxel server crashes on client shutdown
2014-03-21 15:24:45 -07:00
Brad Hefta-Gaub
5abe044c30 Merge pull request #2412 from AndrewMeadows/emergency-fixes
datalength sanity checking for AvatarData packet
2014-03-21 14:48:07 -07:00
ZappoMan
2c8c43094f CR feedback 2014-03-21 14:46:46 -07:00
Philip Rosedale
11873638ec Merge pull request #2437 from birarda/master
reinstate a loudness cutoff when audio is struggling
2014-03-21 14:39:49 -07:00
Stephen Birarda
c99f5a4ae6 int to float conversion in the constructor 2014-03-21 14:38:01 -07:00
Stephen Birarda
98f014d13d add another check to avoid any mixing for a silent frame 2014-03-21 14:37:31 -07:00
Stephen Birarda
3d9aa6cc9f fix a spelling mistake and convert some ints to floats 2014-03-21 14:36:44 -07:00
Stephen Birarda
18e5637976 remove some extra spaces 2014-03-21 14:33:11 -07:00
Brad Hefta-Gaub
c06caa4a4e Merge pull request #2422 from PhilipRosedale/master
Bots can see voxels and move joints, fix drag bug in editVoxels
2014-03-21 14:31:55 -07:00
Atlante45
53eaea6a22 Removed rest of orbit/pan code in editVoxels.js 2014-03-21 14:30:57 -07:00
Atlante45
3721ce8e43 Added boundaries to altitude and changed radius rate 2014-03-21 14:30:12 -07:00
Stephen Birarda
2575b33662 reinstate a cutoff when the audio-mixer is struggling 2014-03-21 14:29:57 -07:00
Atlante45
c10d78c397 Fixed bug when mouse leaves window. 2014-03-21 14:29:19 -07:00
Atlante45
9f96129fb1 Fixed #2379 2014-03-21 14:22:26 -07:00
ZappoMan
3cb3cb81c4 fixes to voxel server crashes on client shutdown 2014-03-21 14:15:02 -07:00
Stephen Birarda
23d54a0f5f Merge pull request #2430 from birarda/master
don't use trailing average for loudness
2014-03-21 11:42:26 -07:00