Commit graph

14093 commits

Author SHA1 Message Date
Clément Brisset
3b4ac91d60 Merge pull request #3073 from ZappoMan/removeOctreeTests
try to get tests to build
2014-06-24 20:28:23 -07:00
ZappoMan
a7f2d150a4 what's this cmake defines ssize_t??? 2014-06-24 20:15:34 -07:00
ZappoMan
fd3916e662 another hack attempt to fix unit tests on windows 2014-06-24 20:10:06 -07:00
ZappoMan
1001ea5f87 fixed some windows warnings 2014-06-24 20:07:47 -07:00
ZappoMan
1eb5b3dda1 argggg ssize_t from stdlib.h 2014-06-24 19:58:59 -07:00
ZappoMan
d967c100c4 argggg ssize_t from types.h 2014-06-24 19:57:52 -07:00
ZappoMan
5486cd4019 argggg ssize_t 2014-06-24 19:29:26 -07:00
ZappoMan
71afc3f4d4 argggg ssize_t 2014-06-24 19:26:24 -07:00
ZappoMan
e5349024e6 argggg ssize_t 2014-06-24 19:15:48 -07:00
ZappoMan
7d759fc00c argggg 2014-06-24 19:11:32 -07:00
ZappoMan
3ad07f4b91 argggg 2014-06-24 19:08:16 -07:00
ZappoMan
fdb0cf9386 change order of headers 2014-06-24 18:53:20 -07:00
ZappoMan
40a842d251 windows build issue 2014-06-24 18:15:00 -07:00
ZappoMan
773e1b0522 try to get tests to build 2014-06-24 18:02:35 -07:00
Clément Brisset
b6a8949b4c Merge pull request #3069 from binaryking/19765
Code Review for Job #19765
2014-06-24 17:49:42 -07:00
AndrewMeadows
2db156d6cd Merge pull request #3072 from ZappoMan/removeOctreeTests
try to disable model tests
2014-06-24 17:35:52 -07:00
ZappoMan
bc5f563f5c and change ring buffer size 2014-06-24 17:25:45 -07:00
ZappoMan
3da18ec1c0 try to disable model tests 2014-06-24 17:23:09 -07:00
Stephen Birarda
7d46b8062b Merge pull request #3070 from birarda/rounding-fix
revert credit balance rounding
2014-06-24 16:25:57 -07:00
Stephen Birarda
5f4baaffa5 revert credit balance rounding 2014-06-24 16:25:41 -07:00
Brad Hefta-Gaub
6d77d438ab Merge pull request #3057 from AndrewMeadows/ragdoll
Ragdoll Part3: avatar shapes self collide (but don't yet affect the joint positions of MyAvatar)
2014-06-24 15:47:18 -07:00
AndrewMeadows
da45e8a5f8 Merge pull request #3058 from ZappoMan/octreeTests
added some model tree performance tests
2014-06-24 14:27:29 -07:00
Mohammed Nafees
d5d2107b97 Merge remote-tracking branch 'upstream/master' into 19765 2014-06-25 01:50:29 +05:30
Mohammed Nafees
7271f85041 Change font size values from pt to px in Chat Window. 2014-06-25 01:49:17 +05:30
Brad Hefta-Gaub
c38790db72 Merge pull request #3068 from ZappoMan/serverSideAudioMixerStats
make default ring buffer much larger
2014-06-24 12:19:35 -07:00
ZappoMan
cdbda02765 make default ring buffer much larger 2014-06-24 12:09:58 -07:00
Stephen Birarda
c46453c97f Merge pull request #3067 from ZappoMan/serverSideAudioMixerStats
adding more stats & allow config setting to enable/disable dynamic jitter buffers
2014-06-24 10:49:35 -07:00
ZappoMan
1d390faad8 add support for commandline/config value for dynamic jitter buffers 2014-06-24 10:29:38 -07:00
ZappoMan
5c188ea81e adding more stats 2014-06-24 09:41:29 -07:00
Brad Hefta-Gaub
2089dec38a Merge pull request #3066 from ctrlaltdavid/fix_default_audio
Fix default audio devices on Windows
2014-06-24 09:33:04 -07:00
David Rowe
c40c5d78c8 Fix default audio devices on Windows
Windows 8 provides the full friendly device name, not just the first 31 characters.
2014-06-24 08:50:39 -07:00
Brad Hefta-Gaub
fc88b1f710 Merge pull request #3065 from ZappoMan/serverSideAudioMixerStats
remove resizing of jitter buffers for now, only ask for 1 frame
2014-06-23 18:54:18 -07:00
ZappoMan
fda60cc8d5 remove resizing of jitter buffers for now, only ask for 1 frame 2014-06-23 18:45:24 -07:00
Brad Hefta-Gaub
c105bc6c39 Merge pull request #3064 from ZappoMan/serverSideAudioMixerStats
max desired must be one less than the max frames in our ringbuffer
2014-06-23 18:11:37 -07:00
ZappoMan
355ab2cb95 max desired must be one less than the max frames in our ringbuffer 2014-06-23 17:58:55 -07:00
Brad Hefta-Gaub
51dfb33985 Merge pull request #3063 from ZappoMan/serverSideAudioMixerStats
add more stats
2014-06-23 17:32:50 -07:00
ZappoMan
6434c0a2a4 add more stats 2014-06-23 17:28:39 -07:00
Brad Hefta-Gaub
672808ef86 Merge pull request #3062 from ZappoMan/serverSideAudioMixerStats
ignore the numSilentSamples from client, always assume one frame
2014-06-23 16:56:58 -07:00
ZappoMan
77f262561c typo 2014-06-23 16:47:10 -07:00
ZappoMan
8a633743b3 ignore the numSilentSamples from client, always assume one frame 2014-06-23 16:40:38 -07:00
Brad Hefta-Gaub
e374ccb0fa Merge pull request #3061 from ZappoMan/serverSideAudioMixerStats
use node uuid in stats
2014-06-23 16:17:51 -07:00
ZappoMan
4becb66e2a use node uuid in stats 2014-06-23 16:10:51 -07:00
Brad Hefta-Gaub
13030d64e6 Merge pull request #3060 from ZappoMan/serverSideAudioMixerStats
break up audio mixer stats across multiple packets
2014-06-23 15:56:27 -07:00
ZappoMan
b2c982976e break up audio mixer stats across multiple packets 2014-06-23 15:46:58 -07:00
Stephen Birarda
5a8bbc7a0e Merge pull request #3059 from ZappoMan/serverSideAudioMixerStats
added server side audio mixer jitter stats
2014-06-23 15:29:00 -07:00
ZappoMan
076bc11545 added server side audio mixer jitter stats 2014-06-23 15:19:13 -07:00
Brad Hefta-Gaub
19195f9119 Merge pull request #3056 from birarda/master
fix rounding of credit balance in application title
2014-06-23 14:48:37 -07:00
ZappoMan
52b61ebab8 added addModel() performance test 2014-06-23 14:48:12 -07:00
ZappoMan
48e779cf8e added some performance tests 2014-06-23 14:08:47 -07:00
Andrew Meadows
d892a9c00f fixed warning about possible uninitialized variable. 2014-06-23 14:07:31 -07:00