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

30729 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
b1fa12cc43 Better debug message 2015-08-26 19:38:24 +02:00
Atlante45
cd8d6df287 Use high_resolution_clock instead of clock 2015-08-26 19:36:18 +02:00
Atlante45
7a5ed24485 typo (I can't spell inactive correctly) 2015-08-26 19:31:33 +02:00
Atlante45
3184dee10a Emit queueInnactive when flow window is full for too long 2015-08-26 17:49:17 +02:00
Atlante45
8049819beb Tweak DoubleLock 2015-08-26 17:11:32 +02:00
Atlante45
b64faea1e3 Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-08-26 16:54:57 +02:00
Clément Brisset
29aee1ee13 Merge pull request #17 from Atlante45/update_protocol 
Update protocol with master
 2015-08-26 16:53:52 +02:00
Atlante45
179ee73e26 Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol 2015-08-26 16:50:33 +02:00
Atlante45
6958a31efe Merge branch 'master' of https://github.com/highfidelity/hifi into protocol 2015-08-26 16:37:45 +02:00
Atlante45
c96632d4b6 Cleanup connection on node kills 2015-08-26 16:07:47 +02:00
Atlante45
373d4b8944 Remove connection from socket when innactive 
If innactive for more than 5 seconds, remove it from hash
 2015-08-26 15:53:49 +02:00
Atlante45
00b224e769 Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-08-26 14:57:31 +02:00
Clément Brisset
2745cc5d12 Merge pull request #15 from birarda/wait-condition 
add a wait condition in SendQueue if there's nothing to do
 2015-08-26 14:57:16 +02:00
Brad Hefta-Gaub
b19f1e0631 Merge pull request #5658 from ctrlaltdavid/20653 
Add Desktop object to JavaScript with width and height properties
 2015-08-25 23:18:20 -07:00
Brad Hefta-Gaub
1cd699de9d Merge pull request #5657 from birarda/master 
fix for 0 entity avg ping
 2015-08-25 22:27:44 -07:00
Brad Hefta-Gaub
029c59fb77 Merge pull request #5654 from jherico/barney 
Fix stereo modes aspect ratio
 2015-08-25 22:16:30 -07:00
Brad Hefta-Gaub
5d5c1584c3 Merge pull request #5659 from jherico/nelson 
Fix UserInputMapper event generation
 2015-08-25 22:14:37 -07:00
samcake
fda9827100 Merge pull request #5529 from SeijiEmery/gputest 
gputest
 2015-08-25 20:03:08 -07:00
Brad Davis
073567558e Fix UserInputMapper event generation 2015-08-25 19:15:06 -07:00
Brad Davis
f176003dad Fixing aspect ratio on stereo plugins 2015-08-25 19:05:31 -07:00
Seiji Emery
d29a368688 removed debug 2015-08-25 16:50:09 -07:00
Seiji Emery
140edd0589 try removing quotes... 2015-08-25 16:21:38 -07:00
David Rowe
9d3d104ec3 Add Desktop object to JavaScript with width and height properties 2015-08-25 16:13:36 -07:00
Atlante45
1d46113d43 Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-08-26 00:44:24 +02:00
Stephen Birarda
67816c033a output megabits per second not per interval 2015-08-25 15:43:21 -07:00
Seiji Emery
248d0729a6 test 2015-08-25 15:29:36 -07:00
Seiji Emery
62dc83fa32 test 2015-08-25 15:00:21 -07:00
Seiji Emery
3d59f8d7e8 changed setup_project to only use the generated shader source files 2015-08-25 14:40:52 -07:00
Seiji Emery
316ddd68ef force cmake autoscribe to use full paths 2015-08-25 13:46:50 -07:00
Atlante45
1878920ba4 Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-08-25 21:43:37 +02:00
Stephen Birarda
6f14eb2206 fix for 0 entity avg ping 2015-08-25 12:35:34 -07:00
Clément Brisset
08ee5cbc17 Merge pull request #5656 from howard-stearns/fix-direct-url-avatars 
fix direct-url avatars
 2015-08-25 21:30:05 +02:00
Clément Brisset
34b3bd211d Merge pull request #14 from birarda/atp 
test for ordered sending in udt-test
 2015-08-25 21:05:42 +02:00
Howard Stearns
6508d5943a textChanged has to do something 2015-08-25 11:29:27 -07:00
Stephen Birarda
d76e8a7e48 remove double settings request for testing 2015-08-25 11:27:31 -07:00
Stephen Birarda
61507bde09 fix order of member initialization in PacketList 2015-08-25 11:24:26 -07:00
Stephen Birarda
9ff7bfd0b5 some header cleanup in UDTTest output 2015-08-25 11:21:04 -07:00
Stephen Birarda
92116dd6e7 added stats for receive rate in Mbits 2015-08-25 11:04:24 -07:00
Stephen Birarda
5e5bd77870 add initialization for all atomics in SendQueue 2015-08-25 09:55:21 -07:00
Atlante45
083a14bf4d Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-08-25 15:08:52 +02:00
Philip Rosedale
ff3a0480fe Merge pull request #5652 from birarda/master 
tweaks to domain-server web interface
 2015-08-24 21:36:52 -07:00
Brad Davis
f9f5743fd7 Merge pull request #5650 from ZappoMan/fixCrashInController 
Fix a couple crashes in the Controller scripting interface
 2015-08-24 18:49:50 -07:00
Stephen Birarda
17befac262 use fixed width for stats tables 2015-08-24 18:10:21 -07:00
Stephen Birarda
b8ac9aa5eb update jquery and bootstrap in DS 2015-08-24 18:02:26 -07:00
Brad Hefta-Gaub
34e32ddaeb Merge pull request #5636 from howard-stearns/marketplace-avatars 
marketplace avatars
 2015-08-24 17:49:20 -07:00
Brad Hefta-Gaub
5ea6d2704a Merge pull request #5628 from ctrlaltdavid/webwindow-external-links 
Make WebWindow hyperlinks with target="_blank" open in user's browser
 2015-08-24 17:45:35 -07:00
Brad Hefta-Gaub
53ae958c74 Merge pull request #5643 from hyperlogic/tony/renderable-particle-crash-fix 
Fix for RenderableParticleEffectEntity crash.
 2015-08-24 17:44:39 -07:00
Brad Hefta-Gaub
c6174ad88a Merge pull request #5647 from jherico/homer 
Removing tabs from our javascript
 2015-08-24 17:33:57 -07:00
Stephen Birarda
f7799bcf8f add TODO for settings fail, cleanup 2015-08-24 17:02:47 -07:00
Stephen Birarda
e84595af49 add a wait condition for empty queue and loss list 2015-08-24 17:02:40 -07:00