Commit graph

49314 commits

Author SHA1 Message Date
samcake
1ded581895 Merge pull request #9217 from zzmp/feat/render-forward-bounds
Render bounds in Forward Render Task
2016-12-16 14:57:14 -08:00
howard-stearns
3adc78fecc Merge branch 'master' of https://github.com/highfidelity/hifi into sessionDisplayNames 2016-12-16 14:16:06 -08:00
howard-stearns
49fd4216de sessionDisplayName set at server and passed to all clients (including
oneself)
2016-12-16 14:15:20 -08:00
Brad Davis
30a9961362 tracing polish 2016-12-16 14:02:27 -08:00
samcake
8cdfef4887 Merge pull request #9212 from AndrewMeadows/benji-001
add profile stats relating to avatar CPU costs
2016-12-16 13:57:55 -08:00
Andrew Meadows
ee6a9f4506 adding profile stats relating to avatar CPU costs 2016-12-16 13:41:31 -08:00
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
David Rowe
9459b967be Merge branch 'master' into 21089 2016-12-16 20:02:43 +13:00
David Rowe
9bf8f25ed0 Update from Seth 2016-12-16 16:11:27 +13:00
Brad Hefta-Gaub
6d7d3551d9 added some stats to the mixer fixed debug logging, improved timer precision 2016-12-15 18:32:11 -08:00
David Rowe
3d6fe6efe8 Move Clara download button when displaying on tablet 2016-12-16 14:58:22 +13:00
Brad Hefta-Gaub
8497ad1e29 Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer 2016-12-15 16:42:41 -08:00
David Rowe
9aaf55e6a3 Fix crash after manually closing Clara download status message box 2016-12-16 12:49:26 +13:00
David Rowe
18a3555453 Fix flash of old desktop window content if reopen after closing with "x" 2016-12-16 12:21:32 +13:00
David Rowe
04aef641c5 Fix auto-downloads not happening after forced log in 2016-12-16 11:45:17 +13:00
David Rowe
a7e0135a6a Continuously update Clara pages because content can change dynamically 2016-12-16 11:28:34 +13:00
Brad Hefta-Gaub
ed19b4b592 remove compression at the per avatar data buffer for now, since it gave no benefit 2016-12-15 14:13:38 -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
David Rowe
b8114b29b2 Make manually closing message box code more correct 2016-12-16 09:47:11 +13: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
Zach Pomerantz
013713f92c rm unused scene 2016-12-15 15:21:57 -05:00
Zach Pomerantz
9e05403aba forward render opaque bounds 2016-12-15 14:59:25 -05:00
Zach Pomerantz
bae6ceb2ae rm extra buffer clears in forward render 2016-12-15 14:57:22 -05:00
Zach Pomerantz
41f6990051 change render forward flag to HIFI_... 2016-12-15 14:53:51 -05: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
David Rowe
861ce2c27b Reduce whitespace in Clara categories 2016-12-15 20:33:43 +13:00
David Rowe
16418d52d2 Scale all imported Clara models to have max dimension of exactly 1m 2016-12-15 20:11:29 +13:00
Brad Hefta-Gaub
439434b300 fixes 2016-12-14 20:24:52 -08:00
David Rowe
349765ad74 Fix Clara download status message box not auto-closing 2016-12-15 16:00:07 +13:00
Brad Hefta-Gaub
c8fb467579 send minimum data for out of view avatars 2016-12-14 18:17:11 -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
Brad Hefta-Gaub
2443b2d6d9 duh 2016-12-14 17:35:02 -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 Rowe
23b8bf7aab Fix crashing if manually close Clara download status message box 2016-12-15 13:35:58 +13: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