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

14133 commits

This branch
This branch
All branches
Author SHA1 Message Date
AndrewMeadows
dba9d33f86 Merge pull request #3075 from huffman/19644 
Code Review for Job #19644
 2014-06-26 09:39:20 -07:00
Clément Brisset
96e81d5596 Merge pull request #3079 from ey6es/metavoxels 
Basic congestion control on TCP model, with tests; fixed errors in, added tests for SpanList.
 2014-06-25 18:34:07 -07:00
Andrzej Kapolka
014ea2a36f Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-25 18:22:33 -07:00
Clément Brisset
e7d3e244fb Merge pull request #3076 from ey6es/master 
Fixes for uninitialized variable warnings, disabled strict aliasing to allow safe type punning (and avoid warnings).
 2014-06-25 18:18:58 -07:00
Andrzej Kapolka
f828b0c466 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-25 16:57:07 -07:00
Andrzej Kapolka
5effcd24ff Only increase/decrease rate when we want to send more/have sent more than the 
minimum, respectively.
 2014-06-25 16:56:02 -07:00
Andrzej Kapolka
705445ce62 Basic congestion control using TCP-esque strategy. 2014-06-25 15:48:46 -07:00
Philip Rosedale
72f9346543 Merge pull request #3077 from ctrlaltdavid/19790 
Code Review for Job #19790
 2014-06-25 15:29:28 -07:00
Andrzej Kapolka
6480c678d2 Disable strict aliasing for safe type punning, fix potentially uninitialized 
variable warning.
 2014-06-25 13:46:13 -07:00
Andrzej Kapolka
41b01dbaed Fix warning and simplify encodeRandomOrder. 2014-06-25 13:00:17 -07:00
Andrzej Kapolka
8999fcef17 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-25 11:42:55 -07:00
Andrzej Kapolka
ae1422e0cb Reset the write position when we hear of packet loss (up to once per round 
trip time).
 2014-06-25 11:42:02 -07:00
David Rowe
e92ad86282 Clear script engine errors once they have been reported 
So that an error is not repeatedly reported to the console and log file.
Also consistently report filename.
And scripts included after one in error will now be run.
 2014-06-25 10:51:18 -07:00
Ryan Huffman
3bec59fd33 Fix unindented line 2014-06-24 20:38:46 -07:00
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
Ryan Huffman
5ece424a45 Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 
Conflicts:
	interface/ui/runningScriptsWidget.ui
 2014-06-24 20:27:44 -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
Andrzej Kapolka
d913ac4486 Fix for streams' getting stuck on the final part. 2014-06-24 19:34:19 -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
Andrzej Kapolka
e7db355c95 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-24 19:11:43 -07:00
ZappoMan
7d759fc00c argggg 2014-06-24 19:11:32 -07:00
Andrzej Kapolka
65e50f32e4 Tests, fixes for SpanList. 2014-06-24 19:10:52 -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
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