Commit graph

48841 commits

Author SHA1 Message Date
David Kelly
d6b99ce57e Removed volume from AudioInjectorLocalBuffer
Since it doesn't use it.  Now clamping at 0-1 in the
AudioInjector::getVolume() call.  This is better -- one spot so it now
always gets clamped.
2016-12-13 17:34:56 -08:00
David Kelly
3f3d922eca No longer applying volume when reading audio injector buffer
Since we also apply the gain in HRTF (on both server and client), the
mono sources sort of had volume^2 applied to them.
2016-12-12 12:01:02 -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
samcake
06b7388930 Merge pull request #9182 from fayeli/photobooth
Photobooth Improvements - Stage, Camera Angles, and Lights
2016-12-10 20:04:40 -08:00
Faye Li Si Fi
78c96293a7 Staging cameras, lights, and backdrop 2016-12-09 17:25:18 -08:00
Faye Li Si Fi
c078751946 Merge remote-tracking branch 'refs/remotes/highfidelity/master' into photobooth 2016-12-09 17:23:54 -08:00
Stephen Birarda
e4810a5643 Merge pull request #9179 from Atlante45/controller-mapping
Update Xbox controller mapping to have the menu on Start
2016-12-09 17:13:45 -08:00
Ken Cooke
a4cbf6be8a Fix to preserve localOnly from script when not ambisonic 2016-12-09 16:55:53 -08:00
Atlante45
5def039bd4 Swap start/back xbox controller mapping to conform to Oculus standard 2016-12-09 16:41:42 -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
samcake
7f73f61e25 Merge pull request #9174 from fayeli/photobooth
Photobooth MVP - Dev tool for taking standardized product pictures
2016-12-09 11:01:51 -08:00
Stephen Birarda
89016f4f15 Merge pull request #9171 from Atlante45/updater
No updater command line argument
2016-12-09 10:56:29 -08:00
Chris Collins
ec4edf5030 Merge pull request #9130 from zzmp/feat/audio-threading
Threaded Audio
2016-12-09 10:46:54 -08:00
Brad Davis
3f9ffd1f9c Merge pull request #9177 from samcake/blue
Fix the missing lighting on AMD
2016-12-09 09:28:31 -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
Chris Collins
b72aa83afa Merge pull request #9169 from samcake/red
Fix the highlight issue introduced RC 29 - 5774
2016-12-08 21:12:47 -08:00
Atlante45
aa1d90108c No updater command line argument 2016-12-08 16:35:30 -08:00
Faye Li Si Fi
33142d6a7f mvp progress 2016-12-08 16:01:50 -08:00
Faye Li Si Fi
52b54dbf0c Merge remote-tracking branch 'refs/remotes/highfidelity/master' 2016-12-08 15:10:57 -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
samcake
8df1ffd38f Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-12-08 14:17:29 -08:00
Clément Brisset
e539840439 Merge pull request #9165 from highfidelity/stable
Merge Stable back into Master
2016-12-08 14:12:14 -08:00
Brad Hefta-Gaub
6edd3a9338 Merge pull request #9168 from jherico/cpu_opt_aabb
Optimized method for transforming axis aligned bounding boxes
2016-12-08 13:45:16 -08:00
Faye Li Si Fi
1644c2eeb4 added unit test 2016-12-08 11:17:38 -08:00
Zach Pomerantz
5969c1eb06 ensure all accesses of audio pool num are guarded 2016-12-08 14:12:16 -05:00
Zach Pomerantz
eafbeb6d44 Revert "avoid pessimizing audio slave lock contention"
This reverts commit 3508e71753.
2016-12-08 14:10:00 -05: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
Zach Pomerantz
3508e71753 avoid pessimizing audio slave lock contention 2016-12-08 01:53:25 +00:00
Zach Pomerantz
6e0ad5a7ed initialize audio threads 2016-12-08 01:52:58 +00: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
Zach Pomerantz
f5b4fac46d set default audio threads to 1 2016-12-07 18:47:33 -05:00
Zach Pomerantz
ce9346f524 fix thread cleanup of audio pool 2016-12-07 18:43:02 -05:00
Faye Li Si Fi
b6798adb5c yay 2016-12-07 15:40:37 -08:00
Faye Li Si Fi
0556661d13 getting rid of uneccessary flag, fix formatting, and getting it to work yay 2016-12-07 15:40:21 -08:00
samcake
3ae06847c4 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-12-07 14:55:26 -08:00
Chris Collins
2601dd3da7 Merge pull request #9160 from highfidelity/RC-29
Beta Release 29 - Includes up to Developer Release 5770
2016-12-07 12:51:19 -08:00
Faye Li Si Fi
0fcb8803b6 attempt to expose last edited property to script 2016-12-07 12:27:31 -08:00
Faye Li Si Fi
fc393262c9 Merge remote-tracking branch 'refs/remotes/highfidelity/master' 2016-12-07 12:24:37 -08:00
Chris Collins
f7e8d47426 Revert "Updated the Qt audio plugins"
This reverts commit b888ce890c.
2016-12-07 12:21:13 -08:00
Zach Pomerantz
d2ed3caf02 respect audio thread pool size setting 2016-12-07 13:40:22 -05:00
Ken Cooke
e4b5c14ea3 PR feedback 2016-12-07 10:15:55 -08:00
Bradley Austin Davis
87dd8a46f8 Preserve and restore the GL context when resizing QML surfaces 2016-12-07 09:19:50 -08:00
Chris Collins
bc9f2b4007 Merge pull request #9163 from jherico/gl_context_preservation
Preserve and restore the GL context when resizing QML surfaces
2016-12-07 09:08:36 -08:00
Bradley Austin Davis
5c3480e2a2 Preserve and restore the GL context when resizing QML surfaces 2016-12-07 05:02:45 -08:00