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 |
|
Andrew Meadows
|
fff7a36b54
|
merge upstream/master into physics project
Conflicts:
interface/src/avatar/Hand.cpp
interface/src/avatar/Hand.h
interface/src/avatar/SkeletonModel.cpp
interface/src/avatar/SkeletonModel.h
interface/src/renderer/Model.h
|
2014-03-25 15:55:26 -07:00 |
|
Stephen Birarda
|
c8b3ae0c40
|
add a mutex to NodeData and leverage in AvatarMixer threads
|
2014-03-25 15:49:47 -07:00 |
|
Stephen Birarda
|
6f4f55038b
|
add back selective inclusion of Avatars based on distance
|
2014-03-25 15:31:53 -07:00 |
|
Andrew Meadows
|
d90b325b1c
|
Add penetration resolution helper for Hand class
|
2014-03-25 15:31:46 -07:00 |
|
Andrew Meadows
|
06fbd49ffa
|
Adding StreamUtils for common debug output
|
2014-03-25 15:29:22 -07:00 |
|
Andrew Meadows
|
5934a17475
|
fix sphere-capsule collisions at the capsule caps
|
2014-03-25 15:27:28 -07:00 |
|
Philip Rosedale
|
746630b378
|
Merge pull request #2497 from birarda/avatar-debug
separate broadcast method to sep thread in AvatarMixer
|
2014-03-25 15:18:28 -07:00 |
|
Stephen Birarda
|
6b8c60e964
|
remove waitForBytesWritten for initial tests
|
2014-03-25 15:10:53 -07:00 |
|
Stephen Birarda
|
292fb51b43
|
use performance throttling instead of distance to decide when to send
|
2014-03-25 15:05:17 -07:00 |
|
Stephen Birarda
|
d5be3f1c9f
|
output socket errors if they occur
|
2014-03-25 15:01:24 -07:00 |
|
Stephen Birarda
|
56869a769d
|
remove some extraneous domain-server check in debugging
|
2014-03-25 14:53:32 -07:00 |
|
Stephen Birarda
|
38ad75fc9e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-debug
|
2014-03-25 14:52:28 -07:00 |
|
Stephen Birarda
|
46f8e2493b
|
Merge pull request #2495 from birarda/random-number
remove loadRandomIdentifier and random number generator seed no longer required
|
2014-03-25 14:46:02 -07:00 |
|
Stephen Birarda
|
f0f3cf7282
|
remove seed to random number generator that is no longer needed
|
2014-03-25 14:36:02 -07:00 |
|
Philip Rosedale
|
ec2254056c
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-03-25 14:35:03 -07:00 |
|
Stephen Birarda
|
7190ce9a88
|
remove loadRandomIdentifier for STUN requests, use UUID
|
2014-03-25 14:33:53 -07:00 |
|
Philip Rosedale
|
e6e10f7b77
|
Merge pull request #2493 from birarda/master
seed random number generator in ScriptEngine
|
2014-03-25 14:30:31 -07:00 |
|
Stephen Birarda
|
41e2ce2b19
|
remove DS check in debug
|
2014-03-25 14:29:59 -07:00 |
|