Andrzej Kapolka
|
0a2670ea23
|
Detabbed.
|
2014-04-17 13:42:29 -07:00 |
|
Andrzej Kapolka
|
a12b90c65b
|
Add head translation to Faceplus. Closes #2684.
|
2014-04-17 13:34:37 -07:00 |
|
Clément Brisset
|
66d61bedf4
|
Merge pull request #2679 from AndrewMeadows/inertia
fix particle-vs-voxel collision callbacks in gun.js
|
2014-04-17 10:41:55 -07:00 |
|
Andrew Meadows
|
e139a6dc95
|
remove warnings about signed-unsigned comparison
|
2014-04-17 08:46:41 -07:00 |
|
Andrew Meadows
|
db717b980b
|
merge upstream/master into andrew/inertia
Conflicts:
interface/src/Application.cpp
|
2014-04-17 08:40:25 -07:00 |
|
AndrewMeadows
|
f73da07aad
|
Merge pull request #2681 from ZappoMan/moonshot
Audio Spatialization, Early Reflections, and Reverb
|
2014-04-16 18:04:09 -07:00 |
|
ZappoMan
|
9fc650dd6e
|
CR feedback
|
2014-04-16 17:10:26 -07:00 |
|
ZappoMan
|
b269a26441
|
CR feedback
|
2014-04-16 17:08:06 -07:00 |
|
ZappoMan
|
4c6471caa4
|
fix typo
|
2014-04-16 16:43:01 -07:00 |
|
ZappoMan
|
836913f1f0
|
Merge branch 'master' of https://github.com/worklist/hifi into moonshot
|
2014-04-16 15:21:15 -07:00 |
|
ZappoMan
|
3cb109ec89
|
clean up
|
2014-04-16 15:21:04 -07:00 |
|
ZappoMan
|
2e0c5fc81b
|
implement support for comb filter suppression window
|
2014-04-16 15:13:20 -07:00 |
|
Andrew Meadows
|
83dc8717aa
|
bumpSettings on load/stop script
|
2014-04-16 14:46:49 -07:00 |
|
Andrew Meadows
|
fe1123ea97
|
gun.js correctly deletes voxel again on collision
|
2014-04-16 14:22:47 -07:00 |
|
ZappoMan
|
b00a67cb57
|
added support for local audio spatialization independent of inbound audio
|
2014-04-16 13:55:39 -07:00 |
|
Andrew Meadows
|
ddb8ac9ad4
|
merge upstream/master into andrew/inertia
|
2014-04-16 13:40:10 -07:00 |
|
Stephen Birarda
|
bd37a75245
|
Merge pull request #2678 from birarda/authentication
push packet version for DS check-ins
|
2014-04-16 13:38:11 -07:00 |
|
Stephen Birarda
|
49e7842d25
|
push packet version to force an update
|
2014-04-16 13:37:41 -07:00 |
|
Andrew Meadows
|
9ab1b76484
|
use new Qt connect syntax for compile-time checks
|
2014-04-16 13:28:54 -07:00 |
|
AndrewMeadows
|
8257e25969
|
Merge pull request #2676 from birarda/authentication
re-instate DS connect behavior
|
2014-04-16 13:13:33 -07:00 |
|
AndrewMeadows
|
7dc8f2ae3c
|
Merge pull request #2657 from ey6es/master
Added tools to adjust avatar LOD to LOD tools dialog. Closes #2624.
|
2014-04-16 12:59:47 -07:00 |
|
Andrew Meadows
|
6b23da40d6
|
use correct name for signal connect
|
2014-04-16 12:18:40 -07:00 |
|
Stephen Birarda
|
505145f693
|
add a missing bracket to IP_DONTFRAG
|
2014-04-16 12:02:02 -07:00 |
|
Stephen Birarda
|
afcb542bbe
|
fix a debug line in LimitedNodeList
|
2014-04-16 11:28:34 -07:00 |
|
Stephen Birarda
|
06a976041b
|
take pointer of optValue and not actual optValue
|
2014-04-16 11:27:30 -07:00 |
|
Stephen Birarda
|
a25ef58247
|
move DTLS socket changes to LimitedNodeList
|
2014-04-16 11:25:35 -07:00 |
|
Stephen Birarda
|
55d540a0eb
|
fix a typo in DomainServer.cpp
|
2014-04-16 11:24:26 -07:00 |
|
Stephen Birarda
|
57567becc8
|
fix unexpected null parameter to disconnect, closes, #2663
|
2014-04-16 11:02:08 -07:00 |
|
Stephen Birarda
|
97e45e8fe5
|
re-instate connect behavior in DS so killed nodes re-connect, amend #2675
|
2014-04-16 10:56:33 -07:00 |
|
Clément Brisset
|
fbafbf4a9b
|
Merge pull request #2672 from stojce/19569
Code Review for Job #19569
|
2014-04-15 22:56:49 -07:00 |
|
Stojce Slavkovski
|
c67e42be5e
|
Moved function into .cpp
|
2014-04-16 07:46:15 +02:00 |
|
ZappoMan
|
ba361b0f62
|
add local audio stats
|
2014-04-15 21:50:44 -07:00 |
|
ZappoMan
|
67de87d114
|
added slider for local audio attenuation
|
2014-04-15 21:31:35 -07:00 |
|
ZappoMan
|
bdf39186de
|
Merge branch 'master' of https://github.com/worklist/hifi into moonshot
|
2014-04-15 21:04:15 -07:00 |
|
ZappoMan
|
040df97be2
|
more cleanup
|
2014-04-15 20:23:47 -07:00 |
|
ZappoMan
|
82d9c50dc5
|
moved all local processing to AudioReflector
|
2014-04-15 20:11:53 -07:00 |
|
ZappoMan
|
a46d3fd254
|
first cut at local audio spatialization working
|
2014-04-15 19:57:37 -07:00 |
|
ZappoMan
|
523cc4bdfe
|
revert some code
|
2014-04-15 16:30:47 -07:00 |
|
ZappoMan
|
a7cbf7f667
|
revert some code
|
2014-04-15 16:26:46 -07:00 |
|
ZappoMan
|
585024d70e
|
resample the local audio before sending it to any registered listeners
|
2014-04-15 16:04:33 -07:00 |
|
ZappoMan
|
f9b6585435
|
some cleanup
|
2014-04-15 15:20:03 -07:00 |
|
ZappoMan
|
5bc8c83706
|
loop and variable name cleanup
|
2014-04-15 15:16:55 -07:00 |
|
ZappoMan
|
e514c95642
|
variable names cleanup to match coding standard
|
2014-04-15 14:47:38 -07:00 |
|
Stojce Slavkovski
|
05023a2585
|
Snapshot preferences title
|
2014-04-15 23:29:28 +02:00 |
|
ZappoMan
|
24f0f37eb9
|
cleanup
|
2014-04-15 14:21:28 -07:00 |
|
ZappoMan
|
f12ac3b036
|
some cleanup
|
2014-04-15 14:14:51 -07:00 |
|
ZappoMan
|
5a0963a731
|
cleaned up comments and range protected some settings
|
2014-04-15 13:58:31 -07:00 |
|
ZappoMan
|
579710e4bd
|
some cleanup
|
2014-04-15 13:36:20 -07:00 |
|
ZappoMan
|
cd23b95b42
|
revert back to using QByteArray for processReceivedAudio()
|
2014-04-15 13:16:52 -07:00 |
|
ZappoMan
|
74828a3215
|
removed non-functional low pass filter
|
2014-04-15 12:54:59 -07:00 |
|