David Kelly
dde4d16759
Merge branch 'master' of github.com:highfidelity/hifi into dk/firstLameAttempt
2016-07-13 15:15:35 -07:00
Brad Hefta-Gaub
487aacde3c
Merge pull request #8216 from huffman/feat/improved-domain-loading
...
Update max request limit and number of processing threads
2016-07-13 14:47:24 -07:00
Brad Hefta-Gaub
f8910d475e
Merge pull request #8225 from ZappoMan/codecPlugins
...
Audio codec plugins
2016-07-13 14:47:03 -07:00
David Kelly
c951f507e3
Fixed issue with calling setOptions
...
Since the stereo option is computed from the .wav file, if you call
setOptions later (like the cow.js does), it resets stereo to false.
So, I now just copy the stereo flag into the new options, since the
sound file is the same.
Also, calling AudioClient::outputLocalInjector on the AudioClient
thread now to avoid potential concurrency issues accessing the
vector of injectors.
2016-07-13 11:28:36 -07:00
David Kelly
8f41b8a5c9
Merge branch 'master' of github.com:highfidelity/hifi into dk/firstLameAttempt
2016-07-13 11:28:10 -07:00
Andrew Meadows
0d58274028
Merge pull request #8231 from AlexanderOtavka/fix-orientation
...
Fix orientation being reset to 0,0,0,1
2016-07-13 08:44:13 -07:00
Brad Hefta-Gaub
20b7ae2e1b
Merge pull request #8222 from AndrewMeadows/better-simple-compound
...
simple-compound = wrap each render part of each submesh
2016-07-12 19:56:04 -07:00
Brad Hefta-Gaub
3aa0ec8900
Merge pull request #8229 from jherico/hmd_frame_resize
...
Expand frame decoration when mouse is over a window in HMD mode
2016-07-12 18:05:27 -07:00
Ryan Huffman
fcd59ea94f
Update target number of processing threads to be based on system
2016-07-12 17:44:23 -07:00
Brad Davis
6336362d40
Fixing decoration inflation
2016-07-12 17:23:13 -07:00
Brad Davis
f2220288fb
Expand frame decoration when mouse is over a window in HMD mode
2016-07-12 16:40:53 -07:00
Brad Hefta-Gaub
c4dba51337
Merge pull request #8226 from jherico/2d_glow
...
Add glow to UI hand lasers and termination points
2016-07-12 16:21:19 -07:00
Zander Otavka
87ba1ffeca
Fix orientation being reset to 0,0,0,1
2016-07-12 16:20:01 -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
9fcecb6277
Merge pull request #8204 from hyperlogic/bug-fix/avatar-url-and-model-name-access-from-js
...
Fix MyAvatar name and url accessors.
2016-07-12 15:30:06 -07:00
Brad Hefta-Gaub
b8d79ec263
Merge pull request #8179 from SamGondelman/snapshotFix3
...
Various snapshot improvements
2016-07-12 15:28:51 -07:00
Brad Hefta-Gaub
819cab4aab
Merge pull request #8158 from sethalves/raypick-avatars
...
Raypick avatars
2016-07-12 15:27:30 -07:00
Brad Hefta-Gaub
84dfe1b0e9
Merge pull request #8219 from jherico/circles
...
Support alpha and color gradients in circle overlays
2016-07-12 15:25:49 -07:00
Brad Davis
0c1edb881b
Merge pull request #8190 from imgntn/viveteleporter
...
Teleportation
2016-07-12 13:41:02 -07:00
Stephen Birarda
03d5a0cb51
Merge pull request #8223 from Atlante45/fix/crash-packet-list
...
Fix crash in packet list
2016-07-12 13:17:26 -07:00
David Kelly
3955e03aa2
Fix for build error
...
doh!
2016-07-12 12:15:12 -07:00
Atlante45
7a7b64e87d
Use domain ID in the stream
2016-07-12 11:43:46 -07:00
Atlante45
a7d631b7e1
Revert packet version change
2016-07-12 11:43:31 -07:00
Atlante45
1a91a8e20a
Make DomainList a sourced packet
2016-07-12 11:39:16 -07:00
Clément Brisset
2f07f0d24f
Revert "Revert "Fix crash in packet list""
2016-07-12 11:39:16 -07:00
Brad Hefta-Gaub
2b719e12f7
attempt to make mac server plugins work
2016-07-12 10:54:45 -07:00
Brad Hefta-Gaub
71b6210c4e
removed some log spam
2016-07-12 10:18:37 -07:00
Brad Davis
6242816f68
Adding glow to hand lasers
2016-07-12 10:10:01 -07:00
Brad Davis
0efc684992
Add glow to the termination point of UI pointers
2016-07-12 10:10:00 -07:00
Brad Hefta-Gaub
6f0967f3fc
add mac support to the codec plugin
2016-07-11 18:28:04 -07:00
Brad Hefta-Gaub
3ddac73718
add mac lib to the external project
2016-07-11 18:24:22 -07:00
Seth Alves
85cc5f8956
Merge branch 'master' of github.com:highfidelity/hifi into raypick-avatars
2016-07-11 18:02:18 -07:00
Brad Hefta-Gaub
ceffa219b3
support for lost packets
2016-07-11 15:18:02 -07:00
James B. Pollack
dc9c06a159
clean util
2016-07-11 15:14:19 -07:00
James B. Pollack
27f70e9d52
finish merge
2016-07-11 15:13:25 -07:00
Brad Hefta-Gaub
bcee128de0
Merge pull request #6959 from Triplelexx/20769
...
CR for Job #20769 - Touchscreen camera input for Interface
2016-07-11 14:24:52 -07:00
Brad Hefta-Gaub
125aa6b337
make zlib and pcm codecs not actually allocate encoder/decoders
2016-07-11 14:21:32 -07:00
Brad Hefta-Gaub
743576134f
fix warnings
2016-07-11 13:38:08 -07:00
Brad Hefta-Gaub
f3f72f3c93
Merge branch 'master' of https://github.com/highfidelity/hifi into codecPlugins
2016-07-11 13:15:27 -07:00
Brad Hefta-Gaub
540ab9f07c
wire up audio codec
2016-07-11 13:00:58 -07:00
Brad Hefta-Gaub
f5b693cebb
added support for external hificodec and hifi codec plugin
2016-07-11 12:22:27 -07:00
David Kelly
c84ef5f626
Stereo injectors now handled same as mono
...
Except of course no HRTF.
2016-07-11 11:31:47 -07:00
Seth Alves
e0739dcc9c
Merge pull request #8224 from sethalves/refresh-feature/grab-script-polish
...
Refresh feature/grab script polish
2016-07-11 11:11:13 -07:00
David Kelly
4f80c77b77
PR feedback
...
simple enough - not sure why I had an issue with this in the first
place.
2016-07-11 10:36:55 -07:00
Seth Alves
52a7c8e032
Merge branch 'feature/grab-script-polish' of github.com:hyperlogic/hifi into refresh-feature/grab-script-polish
2016-07-11 10:09:07 -07:00
David Kelly
46dc5bea04
cleanup from PR comments
2016-07-11 09:31:05 -07:00
David Kelly
80d33ee251
Working now as frame-at-a-time
...
So localOnly sounds get HRTF'd, one network frame at a time. Less
processing (upsampling, limiting, etc...) than doing this at the
end of the pipeline (in the AudioOutputIODevice::readData call).
2016-07-11 09:11:23 -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
