David Kelly
0553dbdcb7
CR feedback
2016-12-16 17:17:10 -08:00
David Kelly
126ae52cb4
Merge branch 'master' of github.com:highfidelity/hifi into dk/machineFingerprintToDS
2016-12-16 12:17:54 -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
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
26639aac15
Merge pull request #8789 from Atlante45/fix/settings
...
Use JSON for application Settings
2016-12-15 07:00:46 -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
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
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
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 Pomerantz
87a8ad1289
strip forward render task to clear and blit
2016-12-13 20:48:05 -05:00
Zach Pomerantz
bc59be12ef
create flagged forward render task
2016-12-13 19:19:30 -05: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
samcake
f509d1fca4
Clening up the fix
2016-12-13 12:48:16 -08:00
Zach Fox
44c6eb303b
Fix the bug
2016-12-13 12:46:31 -08:00
samcake
f8f4ddb16a
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-12-13 11:47:41 -08:00
Zach Pomerantz
9a37ccbf3c
chmod -x to render-utils src
2016-12-13 14:36:41 -05:00
samcake
d4f4bd4519
Debugginfg the bad tiles lighting
2016-12-12 18:02:14 -08:00
Clément Brisset
050c0fe14a
Merge pull request #9188 from kencooke/audio-wav-parser
...
Fix and improve the WAV file loader
2016-12-12 17:51:20 -08:00
Brad Hefta-Gaub
37a4253d20
Merge pull request #9192 from sethalves/es-leak
...
use smart pointers to avoid leaking EntityTreeElementExtraEncodeData
2016-12-12 17:16:00 -08:00
Stephen Birarda
b4f43e01b1
Merge pull request #9189 from huffman/feat/help-touch
...
Add support for oculus touch in help menu
2016-12-12 16:48:00 -08:00
Seth Alves
6fe35ac0da
use smart pointers to avoid leaking EntityTreeElementExtraEncodeData
2016-12-12 16:04:41 -08:00
samcake
9155f11b3d
Merge pull request #9190 from jherico/test_mode
...
Add test mode to interface
2016-12-12 15:37:05 -08:00
Brad Davis
2a43f5fbef
Add test mode to interface
2016-12-12 14:51:11 -08:00
Zach Fox
7030c7b0a6
Space bubble improvements ( #9142 )
...
* The space bubble around a player's avatar is now visualized. When another avatar enters a player's bubble, The bubble visualization will appear, a soft tone will play, and the "Bubble" HUD button will flash.
* The space bubble radius setting has been removed. Space bubble size now scales based on avatar scale.
* Space bubble collision detection is now more accurate and reliable.
* CTRL + N toggles the bubble.
* The "Bubble" HUD button has been moved to the proper location.
2016-12-12 14:22:54 -08:00
Ryan Huffman
9f166d82ce
Add support for oculus touch in help menu
2016-12-12 13:44:09 -08:00
David Kelly
8719d36cd9
Merge pull request #9125 from kencooke/audio-ambisonics
...
First-order Ambisonic renderer
2016-12-12 11:36:12 -08:00
Brad Hefta-Gaub
87e8b6bfeb
only consider standard poses written if the pose was valid
2016-12-12 09:23:01 -08:00
Ken Cooke
a4cbf6be8a
Fix to preserve localOnly from script when not ambisonic
2016-12-09 16:55:53 -08:00
Chris Collins
c912d77a95
Merge pull request #9167 from Atlante45/feat/oculus-reorient-quit
...
Honor reorient and quit request from OVR
2016-12-09 16:03:41 -08:00
Seth Alves
dd3f3957a9
Merge pull request #9164 from fayeli/last-edited-property
...
Exposing last edited property of Entity to Javascript
2016-12-09 13:13:11 -08:00
Faye Li Si Fi
b3ac62bb56
Merge remote-tracking branch 'refs/remotes/highfidelity/master' into last-edited-property
2016-12-09 12:44:17 -08:00
Chris Collins
ec4edf5030
Merge pull request #9130 from zzmp/feat/audio-threading
...
Threaded Audio
2016-12-09 10:46:54 -08:00
sam
2427a16d6e
clean up and less changes
2016-12-09 03:05:25 -08:00
sam
914fc7fca8
rewind all the unecessary changes and do just the minimum layout(std140) and accessing the big arrays in vec4s to fix the amd bug
2016-12-09 02:58:09 -08:00
sam
7a97570949
Debugging the amd shader????
2016-12-09 02:12:31 -08:00
samcake
d851278acd
FIx the highlight issue, the gloss 2 is actually roughnees to the power of 4
2016-12-08 15:04:57 -08:00
Bradley Austin Davis
3fcd45a236
Optimized method for transforming axis aligned bounding boxes
2016-12-08 10:59:14 -08:00
Faye Li Si Fi
9289dd36d4
Merge remote-tracking branch 'refs/remotes/highfidelity/master' into last-edited-property
2016-12-08 10:50:00 -08:00
Atlante45
7b0b777051
Honor reorient and quit request from OVR
2016-12-07 17:29:54 -08:00
Faye Li Si Fi
1fde68c86e
better code style
2016-12-07 16:10:03 -08:00
Faye Li Si Fi
b6798adb5c
yay
2016-12-07 15:40:37 -08:00
