Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 17:51:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
11433 commits 75 branches 59 tags 1.2 GiB
Commit graph

11433 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
7a649084bd reduce the lean recovery timescale 2014-03-26 14:07:21 -07:00
ZappoMan
c56efb9e4c formatting tweaks 2014-03-26 13:41:49 -07:00
Brad Hefta-Gaub
d90ebfd29a Merge pull request #2504 from Atlante45/upload_feedback 
Display warning popup when something went wrong with the fst upload
 2014-03-26 13:31:49 -07:00
Brad Hefta-Gaub
ad93b71f24 Merge pull request #2522 from Atlante45/upload_fixes 
Fixed uninitialized member
 2014-03-26 13:30:53 -07:00
Brad Hefta-Gaub
0265ca516c Merge pull request #2523 from birarda/master 
fix for AudioMixer kill and re-add and no sound load in bot
 2014-03-26 13:30:37 -07:00
ZappoMan
0451ce455f added --statusHost config option to allow us to specify the host name of the status page 2014-03-26 13:25:38 -07:00
Andrew Meadows
9a4db152ff avatar responds to hand-vs-head collisions again 2014-03-26 13:20:18 -07:00
Stephen Birarda
676bcbe2cf Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-26 13:19:35 -07:00
Stephen Birarda
28f962ea2b fix for AudioMixer kill and re-add and no sound load in bot 2014-03-26 13:19:20 -07:00
Andrzej Kapolka
48385ccc32 Fixed Xcode compile error. 2014-03-26 13:17:41 -07:00
ZappoMan
18eda50118 added thread counts to json stats 2014-03-26 13:13:55 -07:00
Atlante45
f95c43393c Fixed uninitialized member 2014-03-26 13:10:56 -07:00
Andrzej Kapolka
99704aee94 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-26 13:06:37 -07:00
Brad Hefta-Gaub
53bc51925d Merge pull request #2518 from ey6es/master 
Fix for default audio device on Windows (it wasn't fetchable by name, so pass along the info object).
 2014-03-26 13:04:51 -07:00
Stephen Birarda
0f859d3eae Merge pull request #2520 from birarda/master 
add missing commas to bot script
 2014-03-26 13:00:27 -07:00
Stephen Birarda
d61c5bb38b add two missing commas to bot script 2014-03-26 13:00:09 -07:00
Brad Hefta-Gaub
5ab7922dad Merge pull request #2519 from birarda/master 
cleanup sound loading in bot script
 2014-03-26 12:59:41 -07:00
Stephen Birarda
e9cbdbb904 cleanup sound loading in bot script 2014-03-26 12:57:10 -07:00
Andrzej Kapolka
97b895be16 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-26 12:43:33 -07:00
Andrzej Kapolka
c18d0ccf8f Formatting fixes. 2014-03-26 12:34:46 -07:00
Andrzej Kapolka
a9097658ad Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-26 12:27:34 -07:00
Andrzej Kapolka
c31b04af4c Fix for Windows initial device selection. 2014-03-26 12:23:08 -07:00
ZappoMan
7a3e19eb0f Merge branch 'master' of https://github.com/worklist/hifi into scaling_work 2014-03-26 12:18:08 -07:00
Philip Rosedale
caed600817 Merge branch 'master' of https://github.com/worklist/hifi 2014-03-26 12:14:12 -07:00
Philip Rosedale
5cce4b3c03 added more movement 2014-03-26 12:14:03 -07:00
Philip Rosedale
b3b9a2f337 Merge pull request #2516 from birarda/master 
actually change NodeList send buffer size
 2014-03-26 12:12:26 -07:00
Stephen Birarda
6e161e7c61 actually attempt to change send buffer size 2014-03-26 12:05:55 -07:00
Philip Rosedale
020f4b020e Merge pull request #2503 from birarda/master 
increase NodeList send buffer size to 1MB
 2014-03-26 12:00:43 -07:00
ZappoMan
bc68ed1300 moved stopTrackingThread() to setIsShuttingDown() to reduce chance of object conflict 2014-03-26 11:59:55 -07:00
Stephen Birarda
962c7350f3 wait on broadcastThread before destroying AvatarMixer, closes #2499 2014-03-26 11:53:57 -07:00
Philip Rosedale
9d8089a7d1 Merge pull request #2514 from birarda/kill-node-button 
add a button on DS admin page to kill all nodes
 2014-03-26 11:50:02 -07:00
Philip Rosedale
9de2e7b70b Merge pull request #2513 from ey6es/master 
Added mono to stereo conversion to fix Linux audio.  Closes #2508.
 2014-03-26 11:46:52 -07:00
Stephen Birarda
4ac487f832 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-26 11:44:51 -07:00
Stephen Birarda
cb617c9e17 add a button on DS admin page to kill all nodes 2014-03-26 11:37:30 -07:00
ZappoMan
c3aab7337f added more performance stats tracking to octree server 2014-03-26 11:36:35 -07:00
Philip Rosedale
427111496c Merge pull request #2510 from birarda/agent-loudness 
add a method to Agent for last read frame loudness
 2014-03-26 11:24:24 -07:00
Stephen Birarda
e03e82a29b ifdef to handle getsockopt format requirements on windows 2014-03-26 11:02:34 -07:00
Andrzej Kapolka
b88708a991 Added mono to stereo conversion to fix Linux audio. Closes #2508. 2014-03-26 11:01:58 -07:00
Stephen Birarda
c4b8ff8952 cast setsocktopt and getsockopt calls to fix windows build 2014-03-26 10:53:43 -07:00
Philip Rosedale
012c4a63de Merge branch 'master' of https://github.com/worklist/hifi 2014-03-26 10:52:31 -07:00
Stephen Birarda
e2b230445f add a method to Agent for last read frame loudness 2014-03-26 10:28:59 -07:00
Philip Rosedale
d90244c01e first pass, clipping audio meter 2014-03-25 22:31:44 -07:00
Andrzej Kapolka
e66cfa8422 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-25 20:41:40 -07:00
Andrzej Kapolka
5934a7fbea Working on voxelizing spanners. 2014-03-25 20:41:19 -07:00
Stephen Birarda
ed9c805539 attempt to set send buffer size to 1MB 2014-03-25 17:29:35 -07:00
Stephen Birarda
46077a7fb0 output old size when notifying for send buffer size change 2014-03-25 17:24:17 -07:00
Stephen Birarda
db757e9e7b increase NodeList send buffer size by default to 128KB 2014-03-25 17:18:45 -07:00
Atlante45
9f95ca8e7c Display warning popup when something went wrong with the fst upload 2014-03-25 17:18:18 -07:00
Philip Rosedale
0d0784ef4b Merge pull request #2498 from birarda/master 
fix thread contention and reinstate distance based avatar-mixer sending
 2014-03-25 16:15:26 -07:00
Stephen Birarda
34634af975 add mutex header to NodeData 2014-03-25 16:05:51 -07:00