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
Chris Collins
dc6ab167e4
Merge pull request #8253 from davidkelly/dk/localNoEcho
...
Injectors now always play locally, and send to server without echo
2016-07-18 15:02:29 -07:00
David Kelly
3df373252f
Several minor things
...
We could only partially fill the _scratchBuffer - .wav files may not
be exactly N frames long. Doh.
While at it, I needed to call finishLocalInjection() after local
injectors are done, and the access to the injector vector needs to
be locked, given that we do a QtDirectConnection with the networking
and thus the outputLocalInjectors is on a different thread.
The clicking was just 0-ing out the _scratchBuffer.
2016-07-18 14:00:41 -07:00
David Kelly
a30b631a0a
Merge branch 'master' of github.com:highfidelity/hifi into dk/localNoEcho
2016-07-18 11:15:58 -07:00
Brad Hefta-Gaub
2cd38064a5
Merge pull request #8235 from jherico/more_shapes
...
Support triangle and hexagon shapes, add shape support to overlays.
2016-07-18 09:05:24 -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
b03686c37f
Change the default domain attenuation level to 0.5
2016-07-15 22:02:56 -07:00
Brad Davis
03cb6175ab
Support triangle and hexagon shapes, add shape support to overlays.
2016-07-15 22:02:17 -07:00
David Kelly
8c0eb1e4d2
Fixed some bad logic
...
When I "fixed" my or instead of and issue, I did it in the wrong
direction. But it looked right :) Now it is. Sigh. Long story
how it got there, but it seems good now.
2016-07-15 19:48:15 -07:00
Ken Cooke
1ee608ad2c
Cleanup
2016-07-15 18:23:12 -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
cf1c954edc
Merge pull request #8257 from jherico/toolbar_hover
...
Fix hover states for toolbar buttons
2016-07-15 18:02:58 -07:00
Philip Rosedale
4925980cbb
Merge pull request #8255 from jherico/search_circle
...
Make search line termination a circle, like 2D UI
2016-07-15 17:51:50 -07:00
Brad Davis
1145c3b590
Smaller and hotter circle, per Philip
2016-07-15 17:45:16 -07:00
Seth Alves
a0e6654ac6
Merge pull request #8247 from hyperlogic/feature/grab-script-polish-part-deux
...
Grab Script Polish (part deux)
2016-07-15 17:34:50 -07:00
Brad Davis
9ebc0c28c8
Fix hover states for toolbar buttons
2016-07-15 17:12:49 -07:00
Brad Hefta-Gaub
b9e11f23dd
Merge pull request #8256 from jherico/decorations2
...
Fix decoration inflation
2016-07-15 17:10:32 -07:00
David Kelly
fb99828e30
PR feedback
...
Code a bit more readable. Sadly (and I guess it makes sense), a
enum class XXX is not a class, so you cannot have member functions
for it. I can imagine no way to have a vtable if you are really
representing it as a uint8_t or whatever. So, I put a stateHas
function in the AudioInjector instead. Definite improvement.
2016-07-15 17:09:27 -07:00
David Kelly
8df4ed01d9
fixed typo
...
which oddly I was sure I already did. Seems I didn't push it? OK
now it is pushed.
2016-07-15 16:22:41 -07:00
Brad Davis
b31300406a
Don't extend glow line length
2016-07-15 16:20:05 -07:00
Brad Davis
317dee1b23
Fix decoration inflation
2016-07-15 16:15:53 -07:00
Anthony Thibault
e4794450c2
Disable attach point saving
2016-07-15 15:36:20 -07:00
Sam Gondelman
e24b064ccd
Merge pull request #8244 from BingShearer/logrolling
...
Delete Old Interface Logs If the Sum Size of Those Logs Exceeds Reasonable Size
2016-07-15 14:14:44 -07:00
Brad Davis
0d811c489a
Removing debug logging
2016-07-15 14:05:16 -07:00
Brad Davis
c462b8c387
Make search line termination a circle, like 2D UI
2016-07-15 13:51:14 -07:00
Bing Shearer
9ee64d114b
Sam's space.
2016-07-15 13:47:36 -07:00
Brad Hefta-Gaub
72739cb6d9
Merge pull request #8228 from jherico/render-perf-updates
...
More render performace testing work
2016-07-15 12:50:38 -07:00
Brad Hefta-Gaub
574aaa9f28
Merge pull request #8248 from jherico/edit_toolbar
...
Migrate edit.js toolbar to the new toolbar API
2016-07-15 12:42:13 -07:00
Brad Hefta-Gaub
bc647a15ec
Merge pull request #8250 from BingShearer/dice
...
Removed button color declarations on createDice.js to make icons visible
2016-07-15 12:39:44 -07:00
Brad Hefta-Gaub
496f3b14c7
Merge pull request #8205 from AndrewMeadows/model-cache-cleanup
...
decouple Geometry from its GeometryResource in ModelCache
2016-07-15 12:38:46 -07:00
Brad Hefta-Gaub
7bb31fe075
Merge pull request #8240 from jherico/hand_controller
...
Menu & hand controller polish
2016-07-15 12:36:31 -07:00
Brad Davis
90299a98fe
PR feedback
2016-07-15 12:19:02 -07:00
Brad Davis
d084623662
PR feedback
2016-07-15 12:15:23 -07:00
David Kelly
0fcc427d41
Merge branch 'master' of github.com:highfidelity/hifi into dk/localNoEcho
2016-07-15 11:01:42 -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
David Kelly
e1212c54cb
Updated to deal with streaming out of both buffers
...
So gotta keep track of when finished streaming to network and
locally separately. That means the State needed to be more of a
bitflag and less of an enum.
2016-07-15 09:55:50 -07:00
Brad Hefta-Gaub
878a01cbaf
Merge pull request #8242 from kencooke/improved-hrtf
...
Improved HRTF
2016-07-15 09:02:15 -07:00
Ken Cooke
2674df6095
Fix the distance-attenuation model (for injectors only)
...
The original attenuation model seems wrong, under-attenuating at close distance but completely muting after 45m.
This uses a physics-based model of -6dB per doubling of distance in free space, for the injectors. The AudioMixer model and domain settings still need to be reworked in a future PR.
2016-07-14 18:34:07 -07:00
Brad Davis
cd6abadc41
Make sure buttons get removed when shutting down scripts
2016-07-14 17:40:05 -07:00
Brad Davis
43e045c22a
Restore mouseover events for items in windows
2016-07-14 17:40:05 -07:00
Brad Davis
a6d71f508e
Fix edit toolbar button vanishing, persistent edit button
2016-07-14 17:40:04 -07:00
Brad Davis
1adf96c8df
Move edit.js to new toolbar API
2016-07-14 17:40:03 -07:00
Brad Davis
fdcbf71623
Remove fade effect from toolbar buttons
2016-07-14 17:40:02 -07:00
Brad Davis
ffdaadf13c
Make toolbars work even when debugging a script
2016-07-14 17:40:02 -07:00
Bing Shearer
aa70a38e79
Removed button color declarations to make icons visible.
2016-07-14 15:59:47 -07:00
Anthony J. Thibault
37d60c6c85
eslint clean
2016-07-14 15:58:13 -07:00
Anthony J. Thibault
31f1d69c43
Merge branch 'master' into feature/grab-script-polish-part-deux
2016-07-14 15:57:41 -07:00
Brad Hefta-Gaub
45aa78702c
Merge pull request #8217 from sethalves/fix-throwing
...
fix throwing
2016-07-14 15:52:41 -07:00
Brad Hefta-Gaub
a544557577
Merge pull request #8246 from highfidelity/jherico-patch-1
...
Remove 'handling reverb' logspam
2016-07-14 15:52:07 -07:00
