Commit graph

10985 commits

Author SHA1 Message Date
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
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
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
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
Andrzej Kapolka
a761a4862b Merge pull request #2398 from AndrewMeadows/emergency-fixes
explicitly send neck angles in avatar data
2014-03-20 11:19:13 -07:00
Andrzej Kapolka
3bd8cddc31 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-20 11:19:05 -07:00
Andrzej Kapolka
f92f45df63 Keep track of keys pressed, synthesize release events when focus is lost.
Closes #2375.
2014-03-20 11:17:36 -07:00
AndrewMeadows
144f86b540 Merge pull request #2370 from Atlante45/model_browsing
Model browsing
2014-03-20 11:15:35 -07:00
Andrew Meadows
6440dd1b5f explicitly send neck angles in avatar data 2014-03-20 11:05:14 -07:00
Stephen Birarda
fb73b6e1ce collect min and max loudness for each frame 2014-03-19 17:57:01 -07:00
Stephen Birarda
515988fae5 Merge pull request #2394 from birarda/master
fix bot.js crash
2014-03-19 17:18:17 -07:00
Stephen Birarda
cbbe4af65f fix crash in bot.js with incorrect playSound 2014-03-19 17:17:52 -07:00
Philip Rosedale
22048aaba5 Merge pull request #2392 from birarda/audio-scaling
allow Agents to send microphone audio using Sound objects
2014-03-19 17:00:46 -07:00
Philip Rosedale
f2793d74ad Merge pull request #2391 from ey6es/master
Remove file texture loading (since we can just use file URLs), don't add...
2014-03-19 16:55:02 -07:00
Andrzej Kapolka
418fc9f69c Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-19 16:52:46 -07:00
Philip Rosedale
e14069c9e3 Merge pull request #2376 from ZappoMan/experimental_scaling
Voxel Server Performance Improvements
2014-03-19 16:24:47 -07:00
Stephen Birarda
dd9c4aa854 changes to bot.js for new Agent microphone audio 2014-03-19 16:18:44 -07:00
Stephen Birarda
8c4fad443f allow Agents to microphone audio from Sound objects 2014-03-19 16:14:58 -07:00
Andrzej Kapolka
e34f2ca69b Remove file texture loading (since we can just use file URLs), don't add alpha
channels for opaque textures (and note when textures with alpha channels are
entirely opaque), enforce a maximum texture size of 1024 by 1024.
2014-03-19 16:11:15 -07:00