Commit graph

5351 commits

Author SHA1 Message Date
AndrewMeadows
a0b458fd1d Merge pull request #3465 from chansensturm/audio-noise
New Audio Edit Buffer Object / Click Removal /  ....
2014-09-22 11:38:42 -07:00
Craig Hansen-Sturm
75858b07c6 coding standard + missing frame-offsets in audiobuffer 2014-09-22 11:21:18 -07:00
Craig Hansen-Sturm
66ec43c066 coding standard - else clause 2014-09-22 11:04:21 -07:00
AndrewMeadows
3d89aa9c9c Merge pull request #3463 from ey6es/deference
Break deferred lighting business out into its own class, use deferred lighting for voxels/avatars/entities/particles in addition to metavoxels.  Don't merge until after conference, obviously.
2014-09-22 10:42:25 -07:00
Brad Hefta-Gaub
631171eb2e Merge pull request #3462 from Atlante45/fix_attachment_bug_with_recording
Fixes concurrency issue with ScriptEngine timers
2014-09-21 20:48:05 -07:00
Craig Hansen-Sturm
4372410fa7 unrolling for int16_t<->float32_t conversion/scaling and copy in/out 2014-09-20 14:49:41 -07:00
Craig Hansen-Sturm
1b2ee4023a out of line inline members for coding standard 2014-09-20 05:46:27 -07:00
Craig Hansen-Sturm
90379ee7eb frame and channel counts are now consistently uint32_t / float32_t replaces float 2014-09-20 04:50:11 -07:00
Craig Hansen-Sturm
47c6ba708f new audio edit buffer object / click removal / apply linear fade to sound clip endpoints 2014-09-20 04:45:58 -07:00
Andrew Meadows
09d3c51120 add multiply(float, Vec3) because multiply commutes 2014-09-19 16:54:03 -07:00
Andrzej Kapolka
6c907a9d83 Read the emissive color property and use it to effect glow. 2014-09-19 16:49:51 -07:00
Atlante45
3d8f3ad9fa Fixes concurrency issue with scriptengine timers 2014-09-19 13:21:24 -07:00
Craig Hansen-Sturm
255d9346bb Merge pull request #3459 from Atlante45/JS_hook_for_recordings
Added JS hooks for new Player options
2014-09-18 17:13:07 -07:00
Atlante45
58b1db4f09 Added JS hooks for new Player options 2014-09-18 16:49:13 -07:00
Clément Brisset
36c6099864 Merge pull request #3457 from chansensturm/audio-noise
Set default for head-penumbra filter to off
2014-09-18 16:46:15 -07:00
Atlante45
29ff8c09d9 Fix LookAtPosition 2014-09-18 15:23:58 -07:00
Andrzej Kapolka
cb1af4499a Merge pull request #3455 from ey6es/master
Tiny tweak to weight loading: only replace lowest weight if the new weig...
2014-09-18 15:05:30 -07:00
Craig Hansen-Sturm
2383379a35 default sine gain set to -6db 2014-09-18 13:52:53 -07:00
Craig Hansen-Sturm
256bd627fa clamp to 0.0f when within EPSILON neighborhood of 0.0f 2014-09-18 13:12:53 -07:00
Andrzej Kapolka
37eb40122c Tiny tweak to weight loading: only replace lowest weight if the new weight is
greater.
2014-09-18 13:05:57 -07:00
Stephen Birarda
1a5149af02 add another missing const to readRecordingFromRecFile 2014-09-18 11:29:51 -07:00
Stephen Birarda
b1abdc05a0 add the last missing consts in Recording.h 2014-09-18 11:25:50 -07:00
Stephen Birarda
93d83b707d use a copy of filename in Recording.cpp to make changes to filename 2014-09-18 11:21:09 -07:00
Stephen Birarda
2ee367fa44 add a couple of missing consts 2014-09-18 11:14:17 -07:00
Stephen Birarda
ac588a569e add const to recording methods where arguments are passed by reference 2014-09-18 11:12:11 -07:00
Stephen Birarda
6e39f049c8 Merge remote-tracking branch 'clement/rec_file_format_tweaks' into clement-recording-changes 2014-09-18 11:08:59 -07:00
Atlante45
72d8522adc Fixed typo + removed MesageBoxes 2014-09-18 10:45:12 -07:00
Atlante45
397be962f4 CR fixes 2014-09-18 10:37:36 -07:00
Stephen Birarda
c9c8a1c194 handle another casing issue for Nodelist include 2014-09-18 10:11:34 -07:00
Stephen Birarda
6d335a8634 fix capitalization in NodeList include 2014-09-18 10:02:54 -07:00
Stephen Birarda
1ac6c8a568 Merge remote-tracking branch 'clement/rec_file_format_tweaks' into clement-recording-changes 2014-09-18 10:02:29 -07:00
Philip Rosedale
929e463e40 Merge pull request #3447 from birarda/webkit-dialogs
add a DataWebDialog class to display auth'ed pages from data-web
2014-09-18 09:48:22 -07:00
Stephen Birarda
a0675162b6 hook My Locations to data-web dialog 2014-09-18 09:35:33 -07:00
Stephen Birarda
e2c3b626b3 add a DataWebDialog for authenticated access to data-web html 2014-09-18 09:05:25 -07:00
Atlante45
e0739e4aa8 PreCR fixes 2014-09-18 00:03:02 -07:00
Atlante45
06dd9d0376 Moved Player and Recording to their own files 2014-09-17 23:52:21 -07:00
Brad Hefta-Gaub
c232c07724 Merge pull request #3441 from birarda/master
remove the access token from API urls and put in Authorization header
2014-09-17 23:25:54 -07:00
Andrew Meadows
8359e672bb merge upstream/master into andrew/ragdoll 2014-09-17 17:56:35 -07:00
Philip Rosedale
fe9ae5bc69 Merge pull request #3442 from Atlante45/script_engine_fix
Fix timer bug with script engine
2014-09-17 17:10:53 -07:00
Atlante45
d27134a7ac Added getters for the different Player options 2014-09-17 17:06:47 -07:00
Atlante45
66a3683482 Fix timer bug with script engine
Occurs when Script.clearInterval() called inside
Script.setInterval callback
2014-09-17 16:48:46 -07:00
Atlante45
34c16b8a74 Convert .rec to new format if necessary 2014-09-17 16:25:48 -07:00
Atlante45
6e55c66d09 Fix radix bug 2014-09-17 16:24:54 -07:00
Stephen Birarda
9ee063bdc1 remove the access token from API urls and put in Authorization header 2014-09-17 16:00:20 -07:00
Andrzej Kapolka
22342e45bc Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-17 13:27:45 -07:00
Andrzej Kapolka
801630e19c Normalize vertex weights if they don't add up to one; replace lowest weight
if we can't find an empty slot.
2014-09-17 13:26:57 -07:00
ZappoMan
ab447e20ee move filter to single instance in mixer, and do filtering on pre-mix buffer not the mixed buffer 2014-09-17 12:48:47 -07:00
Atlante45
aeba8a9dab Merge branch 'master' of https://github.com/highfidelity/hifi into rec_file_format_tweaks 2014-09-17 10:25:47 -07:00
Andrzej Kapolka
213b4e6ee6 Removed testing code. 2014-09-16 17:53:40 -07:00
Andrzej Kapolka
fbd1efad81 Allow specifying material opacity. 2014-09-16 17:52:39 -07:00