Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 19:27:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
14328 commits 25 branches 0 tags 1.1 GiB
Commit graph

14328 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
wangyix
d098edcdf0 Merge remote-tracking branch 'upstream/master' 2014-06-24 17:39:13 -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
wangyix
52f00769d4 merged with upstream 2014-06-24 17:22:30 -07:00
wangyix
e1d28dfe73 removed debug code 2014-06-24 17:14:20 -07:00
wangyix
5fd1d0a87c added AudioRingBuffer unit test 
fixed bug with _endOfLastWrite not rolling over in addSilentFrame
 2014-06-24 16:51:51 -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
Philip Rosedale
81e7f8e0a5 Merge branch 'master' of https://github.com/worklist/hifi 2014-06-24 16:21:35 -07:00
Philip Rosedale
9eb91e2b44 tweaking params 2014-06-24 16:15:16 -07:00
Philip Rosedale
5bb2c3c62f Added in-world test tone JS file 2014-06-24 16:14:40 -07:00
Stephen Birarda
11f23ca6f6 add POSTing of settings to DS via form2js 2014-06-24 15:56:53 -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
Stephen Birarda
cf0e1ab1a9 finish up handlebars template for settings 2014-06-24 14:24:56 -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
Stephen Birarda
afe2e57701 add a settings page to DS that uses handlebars template library 2014-06-24 12:33:40 -07:00
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
wangyix
8e2bb130f7 added extra sample in AudioRingBuffer... 
changed buffer overflow behavior to overwrite old data in writeData;
added overflow behavior to drop silent samples in addSilentFrame
 2014-06-24 12:18:40 -07:00
ZappoMan
cdbda02765 make default ring buffer much larger 2014-06-24 12:09:58 -07:00
Ryan Huffman
173be2c89d Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 2014-06-24 12:01:04 -07:00
Ryan Huffman
f249020d6d Clean up redundant if statement 2014-06-24 11:50:54 -07:00
Ryan Huffman
89f43acb7f Add a tooltip with the full path to running scripts 2014-06-24 11:47:14 -07:00
Ryan Huffman
652543cdca Update _scriptEngineHash to work with duplicate running scripts 2014-06-24 11:46:35 -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
Stephen Birarda
bb0d0d067e Merge branch 'master' of https://github.com/highfidelity/hifi 2014-06-24 09:44:37 -07:00
ZappoMan
5c188ea81e adding more stats 2014-06-24 09:41:29 -07:00
wangyix
c2b22c0aa2 Merge remote-tracking branch 'upstream/master' 2014-06-24 09:34:07 -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
Philip Rosedale
556578b8dc first pass - hair as vertlet strands 2014-06-24 09:30:11 -07:00
wangyix
254946be9e removed duplicate method from merge 2014-06-24 09:27:41 -07:00
wangyix
53e3f5a3b0 merged with upstream 2014-06-24 09:13:05 -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
wangyix
a4f5ce2215 added stats for audiomixer jitter buffers lengths in Application 2014-06-23 17:48:57 -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