Commit graph

48980 commits

Author SHA1 Message Date
David Kelly
126ae52cb4 Merge branch 'master' of github.com:highfidelity/hifi into dk/machineFingerprintToDS 2016-12-16 12:17:54 -08:00
Stephen Birarda
2d86305e98 Merge pull request #9223 from huffman/fix/touch-hand-positioning
Adjust positioning of avatar hands to better match touch controller position
2016-12-16 11:46:07 -08:00
Ryan Huffman
2e25f18e76 Adjust positioning of avatar hands to match touch controller position 2016-12-16 11:03:20 -08:00
David Kelly
4d7f3051a7 Expose Machine Fingerprint perms in DS settings page
Should be about same as MAC or IP for now, applies whenever you are not
logged in.
2016-12-16 10:19:37 -08:00
samcake
5ce854612a Merge pull request #9213 from jherico/chrome_tracing
Add support for chrome tracing output
2016-12-16 09:37:55 -08:00
Brad Davis
a12b8b4b62 Cleanup dead code 2016-12-16 09:21:41 -08:00
Chris Collins
940ead46d0 Merge pull request #9214 from kencooke/audio-ambisonic-src
Ambisonic resampler, optimized using AVX2
2016-12-16 09:19:34 -08:00
David Kelly
7a346b99b9 Add CoreFoundation to libraries we link to on MacOS
Turns out vhacd-util and ice-server don't link to it, and we need
it for machine fingerprint.  So the build system doesn't make mac
vhacd-util or ice-server builds I guess, or this would have shown
up awhile ago.
2016-12-16 08:58:20 -08:00
Ryan Huffman
7bb2755913 Add chrome tracing support 2016-12-16 01:14:01 -08:00
Howard Stearns
ba8b585368 Merge pull request #9202 from howard-stearns/pal-proto
People Action List prototype
2016-12-15 13:56:12 -08:00
Brad Hefta-Gaub
0923a79139 Merge pull request #9187 from PhilipRosedale/rescale
Rescale yourself or entities using the grip buttons
2016-12-15 12:32:04 -08:00
howard-stearns
0e81e71325 fix selection and hud-hiding issues 2016-12-15 11:00:32 -08:00
Brad Hefta-Gaub
25c6e8021f Merge pull request #9198 from zzmp/chmod/render-utils
Change file permissions of source code to remove execute bits
2016-12-15 10:37:36 -08:00
samcake
7a29dbe7d4 Merge pull request #9207 from zzmp/feat/render-forward-empty
Forward render task (empty and only used with RENDER_FORWARD set)
2016-12-15 09:57:18 -08:00
Seth Alves
4494edae33 Merge pull request #9210 from zfox23/FB_2591
FB 2591: Taking simultaneous GIF snapshots crashes Interface
2016-12-15 07:01:58 -08:00
Seth Alves
26639aac15 Merge pull request #8789 from Atlante45/fix/settings
Use JSON for application Settings
2016-12-15 07:00:46 -08:00
Seth Alves
b11bfd405d Merge pull request #9216 from birarda/min-cores-comment
fix a confusing comment about min cores required
2016-12-15 06:55:26 -08:00
Stephen Birarda
4c1f99954b fix confusing MIN_CORES_SPEC comment 2016-12-14 17:49:08 -08:00
Stephen Birarda
6c344b0c75 Merge pull request #9211 from Atlante45/disable_steamworks
Make Steam client calls into a plugin
2016-12-14 17:35:51 -08:00
howard-stearns
ae4064f445 Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto 2016-12-14 17:04:52 -08:00
David Kelly
2566778654 Handle no setting manager case
Can't save the fallback generated UUID for machine fingerprint if
the user of this stuff doesn't have a settings file.  Found this when
I noticed needed to initialize com for all the assignment clients
2016-12-14 16:43:37 -08:00
David Kelly
cb14b0e3e0 inital cut, passing fingerprint in
does permissions same as mac address, more or less.  Not exposed
yet, just a beginning.
2016-12-14 16:09:13 -08:00
Atlante45
588fdd6efa Add steamworks to interface externals 2016-12-14 16:07:33 -08:00
Atlante45
bfc789f072 CR - CLI text 2016-12-14 15:44:00 -08:00
Atlante45
0dec97fc03 Make Steamworks a plugin 2016-12-14 15:37:49 -08:00
Ken Cooke
b4994a3d89 Ambisonic resampler, optimized using AVX2.
int16_t and float versions.
Removed unused SSE2 version.
Removed unused getExactInput().
Refactored to remove nested #ifdefs.
2016-12-14 15:18:41 -08:00
Philip Rosedale
14c867fdbd Can't resize if objects in both hands, avatar resize is seek + grips 2016-12-14 13:38:37 -08:00
Andrew Meadows
c1e283fa6d Merge pull request #9201 from samcake/red
Fix local light shading tiling issue
2016-12-14 12:25:02 -08:00
Zach Fox
c53111781b Fix the bug 2016-12-14 12:17:00 -08:00
howard-stearns
66e2c651c6 clean up avatar nodes properly (and add some logging) 2016-12-14 11:26:33 -08:00
Stephen Birarda
1829f540cf Merge pull request #9206 from Atlante45/controller-mapping
Fix Oculus Touch flags check
2016-12-14 11:17:03 -08:00
Howard Stearns
d5c219a761 deal with bubble-bounces (and comment the code a bit) 2016-12-13 19:52:27 -08:00
Clément Brisset
1aec8c5a65 Merge pull request #9205 from ZappoMan/avatarMixerTweaks
drop avatar data rate to 45hz & bump default per client bandwidth from mixer
2016-12-13 18:25:35 -08:00
Zach Pomerantz
87a8ad1289 strip forward render task to clear and blit 2016-12-13 20:48:05 -05:00
Zach Pomerantz
bbb7229392 skip graphics config if not in engine 2016-12-13 20:47:28 -05:00
Atlante45
07802eb284 Fix Oculus Touch flags check 2016-12-13 17:08:00 -08:00
Brad Hefta-Gaub
92632e72b6 make default avatar mixer send bandwidth 5mbps 2016-12-13 17:04:25 -08:00
howard-stearns
4503855ae8 don't keep selection while things are disappearing 2016-12-13 17:00:24 -08:00
howard-stearns
a50b731faa fix broken search for myself 2016-12-13 16:52:18 -08:00
Brad Hefta-Gaub
e3bc49c302 drop avatar data rate to 45hz 2016-12-13 16:51:59 -08:00
howard-stearns
773bbc4ef1 update canKick whenever we get new data, instead of just at first use. 2016-12-13 16:30:16 -08:00
howard-stearns
00653b6b19 missing the ban button 2016-12-13 16:23:43 -08:00
Zach Pomerantz
bc59be12ef create flagged forward render task 2016-12-13 19:19:30 -05:00
howard-stearns
03d3e0b550 Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto 2016-12-13 16:03:00 -08:00
howard-stearns
b0547750b0 people.svg 2016-12-13 15:53:45 -08:00
Brad Hefta-Gaub
a2ba03284e Merge pull request #9186 from ZappoMan/kinectPlugin
Kinect Plugin
2016-12-13 15:29:41 -08:00
samcake
d9cb07bf9a Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-12-13 15:28:33 -08:00
samcake
0b221abfb2 writting the abs differently 2016-12-13 15:27:50 -08:00
howard-stearns
b0a69468d2 Don't show admin columns if you can't kick. 2016-12-13 15:16:18 -08:00
howard-stearns
adbfa0752a no debug printing 2016-12-13 15:09:46 -08:00