Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 12:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
10115 commits 71 branches 56 tags 1.2 GiB
Commit graph

10115 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
01e69bf8d0 Merge pull request #2141 from ZappoMan/SvoViewer 
fixed text renderer and frame rate display
 2014-02-28 02:16:38 -08:00
ZappoMan
88af57eaeb Merge pull request #2138 from PhilipRosedale/master 
Travelling noises removed, audio bargraph removed, improve jitter rebuffer behavior
 2014-02-28 02:00:07 -08:00
ZappoMan
4bca28abb2 fixed text renderer and frame rate display 2014-02-28 01:57:24 -08:00
Philip Rosedale
38f4207fe5 Merge pull request #2140 from ZappoMan/SvoViewer 
fix debug output and add command line options
 2014-02-28 01:09:11 -08:00
ZappoMan
8afb211ec8 fix debug output and add command line options 2014-02-28 01:07:23 -08:00
Philip Rosedale
6355d51958 Merge pull request #2139 from ZappoMan/SvoViewer 
Svo viewer
 2014-02-28 00:22:22 -08:00
ZappoMan
de0f320c02 added copyright to files 2014-02-28 00:14:47 -08:00
ZappoMan
6bc71f899c removed unused code 2014-02-28 00:09:15 -08:00
ZappoMan
45b5f54bc5 adding Matt's SvoViewer 2014-02-28 00:06:37 -08:00
Philip Rosedale
7a2279bda8 Merge branch 'master' of https://github.com/worklist/hifi 2014-02-27 23:31:45 -08:00
Philip Rosedale
d5e106b30d collision submenu only under edit (I don’t think you can make same one twice) 2014-02-27 23:29:29 -08:00
Philip Rosedale
bae16e24e8 new audio buffer display text, cleanup drawText() 2014-02-27 23:17:39 -08:00
Philip Rosedale
bde7152246 Merge pull request #2135 from ZappoMan/bugfixes 
bug fixes
 2014-02-27 20:43:48 -08:00
Philip Rosedale
5f8c5d36da Merge branch 'master' of https://github.com/worklist/hifi 2014-02-27 20:29:35 -08:00
Philip Rosedale
7a73ecf98e Merge pull request #2136 from ey6es/master 
Factored out common resource cache functionality, added limits to simultaneous downloading (prioritized by distance).  Closes #2122.
 2014-02-27 20:29:00 -08:00
Andrzej Kapolka
73ec568b4b Further work on request limiting. 2014-02-27 19:28:45 -08:00
Andrzej Kapolka
5d4ed4c85e Merge branch 'master' of https://github.com/highfidelity/hifi 2014-02-27 18:14:18 -08:00
Andrzej Kapolka
29f7954d20 Factored out bits common to resource caches, added global limit on number of 
resources being requested at any one time.
 2014-02-27 18:13:40 -08:00
Philip Rosedale
7ce380a333 relocate mute button, audio scope 2014-02-27 18:02:53 -08:00
ZappoMan
19b7189269 switch AUTO LOD to use moving avarage of FPS, and also tweak the min and max behavior 2014-02-27 18:00:58 -08:00
Philip Rosedale
f06b30e024 remove audio barograph latency display 2014-02-27 17:45:47 -08:00
Philip Rosedale
fb97abf128 reset audio connection on prefs changes 2014-02-27 17:35:23 -08:00
Philip Rosedale
ae6d156feb remove travelling noises 2014-02-27 17:27:41 -08:00
ZappoMan
0f0f0eeb81 Merge branch 'master' of https://github.com/worklist/hifi into bugfixes 2014-02-27 17:10:32 -08:00
ZappoMan
0530a73175 Merge pull request #2134 from stojce/19513 
Code Review for Job #19513
 2014-02-27 16:30:54 -08:00
ZappoMan
f9718913e2 fix octree-server random spinout sometimes when client disconnects 2014-02-27 16:13:05 -08:00
Philip Rosedale
7b55ee31a3 Merge branch 'master' of https://github.com/worklist/hifi 2014-02-27 16:01:04 -08:00
Philip Rosedale
348295bbb1 Merge pull request #2133 from ey6es/master 
Delay loading models until we know that we need them (i.e., that we're not going to use the billboard).
 2014-02-27 16:00:04 -08:00
Philip Rosedale
cdda220c83 Merge pull request #2120 from ZappoMan/seeing_voxels 
Voxel Scale Testing: Seeing voxels & particles in JS & OctreeServer improvements
 2014-02-27 15:58:14 -08:00
Philip Rosedale
e87ae8ac8f audio debugging 2014-02-27 15:52:19 -08:00
ZappoMan
1cc6288899 add back in entry point for import voxels 2014-02-27 15:41:36 -08:00
ZappoMan
b7f62eabf0 clean up more menu items 2014-02-27 15:25:39 -08:00
stojce
ae78cac78b removed some magic numbers 2014-02-28 00:05:46 +01:00
stojce
7d67b8e60d fixed vertical thumb placement on window resize 2014-02-27 23:28:23 +01:00
stojce
5c22376312 editVoxels new layout / assets 2014-02-27 23:20:40 +01:00
Andrzej Kapolka
e91d47174b Removed unused function. 2014-02-27 12:37:17 -08:00
Andrzej Kapolka
cd2bd32210 Delay loading models until we know that we need them (i.e., that we're not 
beyond billboard distance).  Closes #2121.
 2014-02-27 12:30:46 -08:00
ZappoMan
8d53fc9671 Merge branch 'master' of https://github.com/worklist/hifi into seeing_voxels 2014-02-27 01:05:20 -08:00
ZappoMan
2832c33482 fixed div by zero 2014-02-26 21:38:28 -08:00
ZappoMan
6f1136c417 more status page formatting, and include max total packets in packets per client interval 2014-02-26 21:25:34 -08:00
ZappoMan
85a42849a8 work on current client count 2014-02-26 21:25:15 -08:00
ZappoMan
8c4fdbb1c6 remove dead comments 2014-02-26 21:24:50 -08:00
ZappoMan
a34aef658d cleanup OctreeSendThread correctly 2014-02-26 21:24:32 -08:00
ZappoMan
1603c1f38c work on client stats and max total packets per second 2014-02-26 21:24:12 -08:00
Philip Rosedale
89cf2f9a7a Merge pull request #2125 from birarda/simple-audio 
increase size of audio output buffer to match ring buffer
 2014-02-26 16:31:40 -08:00
Stephen Birarda
cb45a3242d increase size of audio output buffer to match size of ring buffer 2014-02-26 16:29:07 -08:00
Stephen Birarda
1f1369367f Merge pull request #2124 from birarda/master 
bot.js repair for wrong body when bot # < 20
 2014-02-26 16:18:13 -08:00
Stephen Birarda
88b46acdeb repair for wrong body on bots < 20 2014-02-26 16:17:51 -08:00
ZappoMan
98d9e443eb Merge pull request #2119 from PhilipRosedale/master 
NPC bots wander and look around, and play sounds
 2014-02-26 14:40:58 -08:00
ZappoMan
39ba98f3b1 fixed a comment 2014-02-26 14:23:58 -08:00