Commit graph

11021 commits

Author SHA1 Message Date
Andrzej Kapolka
1b980eebf2 More work on delta streaming. 2014-03-21 14:49:40 -07:00
Andrzej Kapolka
924e5517f4 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-21 11:12:10 -07:00
Andrzej Kapolka
f3873718b4 Merge pull request #2426 from ey6es/master
Add Ryan's updated smoothing factors.
2014-03-21 10:49:59 -07:00
Andrzej Kapolka
5b3340ce49 Add Ryan's updated smoothing factors. 2014-03-21 10:38:29 -07:00
Stephen Birarda
acedc555d5 Merge pull request #2424 from birarda/audio-scaling
move and remove some debugging for audio mixer
2014-03-21 10:26:41 -07:00
Stephen Birarda
c1cbc79807 move debug for no reply domain checkins to ThreadedAssignment 2014-03-21 10:26:09 -07:00
Stephen Birarda
6f37bb54f8 suppress useless audio debug 2014-03-21 10:19:17 -07:00
Philip Rosedale
a7d5cdbae0 Merge pull request #2420 from ZappoMan/bugfixes
fix editVoxels.js mouse clicking
2014-03-21 10:13:45 -07:00
Stephen Birarda
5580a5cfc4 Merge pull request #2421 from birarda/audio-scaling
output number of no reply checkins when finished
2014-03-21 10:10:46 -07:00
Stephen Birarda
0105029d9c output number of no reply domain checkins when finished 2014-03-21 10:10:25 -07:00
ZappoMan
939265356b fix editVoxels.js mouse clicking 2014-03-21 10:03:01 -07:00
Philip Rosedale
c3430b8e45 Merge pull request #2419 from birarda/audio-scaling
remove mixer cutoff strategy for testing
2014-03-21 09:53:09 -07:00
Stephen Birarda
24e9446814 remove mixer cutoff strategy for testing 2014-03-21 09:52:07 -07:00
Andrzej Kapolka
9c2f6ab2e5 Working on delta streaming for collections. 2014-03-20 18:28:43 -07:00
Philip Rosedale
b49058ea77 Merge pull request #2402 from Atlante45/inspect_js
Inspect js
2014-03-20 17:21:21 -07:00
Philip Rosedale
57fb0c9d0f Merge pull request #2413 from birarda/audio-scaling
more audio scaling tweaks
2014-03-20 17:12:28 -07:00
Stephen Birarda
5ae63c5b0f use a trailing average for sleep time, move loudness to RB 2014-03-20 17:10:24 -07:00
Stephen Birarda
5515141792 use a trailing average for _nextOutputLoudness 2014-03-20 16:50:20 -07:00
Philip Rosedale
5d361a1bd0 Merge pull request #2403 from Atlante45/fix_models_upload
Fix models upload
2014-03-20 16:20:38 -07:00
Philip Rosedale
4a719f678e Merge pull request #2410 from birarda/audio-scaling
require a min loudness for stream to be mixed in
2014-03-20 16:18:41 -07:00
Stephen Birarda
7f96c71793 actually require minRequiredLoudness for a stream to be mixed in 2014-03-20 16:17:09 -07:00
Stephen Birarda
508e59217f Merge branch 'master' of https://github.com/highfidelity/hifi into audio-scaling 2014-03-20 16:16:43 -07:00
Atlante45
746d109025 Merge branch 'master' of https://github.com/highfidelity/hifi into inspect_js 2014-03-20 16:10:33 -07:00
Atlante45
6b118939fd Removed orbit from editVoxels.js so there is no conflict with inspect.js 2014-03-20 16:09:25 -07:00
Philip Rosedale
a30af08062 Merge pull request #2407 from ZappoMan/voxel_server_crash_fixes
fix voxel server crash/pure virtual call on shutdown of client
2014-03-20 15:33:59 -07:00
Philip Rosedale
f0d4efbd57 Merge pull request #2409 from birarda/audio-scaling
add N loudest throttling for audio-scaling
2014-03-20 15:32:28 -07:00
Atlante45
c8d81e1ed6 Merge branch 'master' of https://github.com/highfidelity/hifi into fix_models_upload 2014-03-20 15:32:26 -07:00
Atlante45
65603b0631 Fixed typo 2014-03-20 15:30:28 -07:00
Andrzej Kapolka
335fed0453 Merge pull request #2405 from ey6es/master
Let's actually use the result of our format conversion.
2014-03-20 15:21:24 -07:00
ZappoMan
b4f5a6d1ce add _isShuttingDown to OctreeQueryNode and bail as fast as possible when shutting down 2014-03-20 14:44:47 -07:00
Andrzej Kapolka
56ff423cf5 Let's actually use the result of our format conversion. 2014-03-20 14:27:38 -07:00
Andrzej Kapolka
20e9572f60 Working on specialized delta streaming. 2014-03-20 14:20:05 -07:00
Andrzej Kapolka
8515e9e04b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-20 14:15:31 -07:00
Stephen Birarda
99c27cf748 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-scaling 2014-03-20 14:03:02 -07:00
Atlante45
bf85f8d5e5 Changed model_type to model_categorie in FstReader 2014-03-20 14:00:27 -07:00
Atlante45
a908c23f61 Merge branch 'master' of https://github.com/highfidelity/hifi into fix_models_upload 2014-03-20 13:58:44 -07:00
Clément Brisset
0d432e169a Merge pull request #2399 from ey6es/master
Fix for movement being stuck if you switch focus when a key is pressed.
2014-03-20 13:51:21 -07:00
Clément Brisset
4c7f40b006 Merge pull request #2401 from ey6es/flatmosphere
Added a "flat" atmosphere mode (the default) that makes the atmosphere follow you around on the X/Z axes.
2014-03-20 13:50:37 -07:00
Andrzej Kapolka
93846460ff Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-20 13:12:28 -07:00
Stephen Birarda
64f946b640 require that buffers be above min loudness to be mixed in 2014-03-20 13:01:52 -07:00
Stephen Birarda
a8ef64e0ce calculate a cutoff loudness for mixer recovery 2014-03-20 12:52:17 -07:00
Atlante45
e68500e11f Made models line edit editable 2014-03-20 12:49:51 -07:00
Atlante45
c658b1dded Modified menu upload categories 2014-03-20 12:45:19 -07:00
Atlante45
947dde3715 Modified models uploader to diferrenciate heads and skeletons 2014-03-20 12:44:37 -07:00
Atlante45
4604f5333d Merge branch 'master' of https://github.com/highfidelity/hifi into inspect_js 2014-03-20 12:15:55 -07:00
Atlante45
a95befb02e Added new script inspect.js 2014-03-20 12:15:38 -07:00
Atlante45
39a6e03476 Modified MyAvatar to support more JS 2014-03-20 12:09:33 -07:00
Andrzej Kapolka
20ae5c15f7 Added a "flat" mode for environments that makes them follow you around on the
X/Z axes.  The default environment is flat.  Closes #2378.
2014-03-20 12:09:20 -07:00
Andrzej Kapolka
4513e1675d More line number changes in the translation file. 2014-03-20 11:35:57 -07:00
Andrzej Kapolka
735f563f5e Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-20 11:19:23 -07:00