Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-17 14:40:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
40552 commits 72 branches 59 tags 1.2 GiB
Commit graph

1985 commits

Author SHA1 Message Date
Ryan Huffman
9eb0fdf589 Clean up AssetServer mapping handling 2016-03-07 13:50:08 -08:00
Ryan Huffman
6b485cf81d Update atp mapping operations to use a single packet 2016-03-07 13:49:55 -08:00
Ryan Huffman
9148db2612 Clean up AssetServer mapping handling 2016-03-07 13:22:23 -08:00
Stephen Birarda
0b578bf086 only enable logging if a log directory is passed 2016-03-04 12:56:35 -08:00
Stephen Birarda
efa46b8c7b add option to disable AC child file logging 2016-03-04 11:58:46 -08:00
Ryan Huffman
db98e46bb8 Update atp mapping operations to use a single packet 2016-03-01 16:18:35 -08:00
Atlante45
7b179ab91a First draft for mapping requests 2016-03-01 13:08:46 -08:00
Stephen Birarda
f44cf3903c re-instate verified domain ownership for full automatic networking 
This reverts commit 34408c8144.
 2016-03-01 13:04:37 -08:00
Atlante45
6a4b93a4e7 Proper fix for DiskCacheInfo 2016-03-01 12:00:43 -08:00
Atlante45
2c1762526d Move all resource requests to the same thread 2016-03-01 12:00:43 -08:00
Clément Brisset
2ffaa1f2e7 Merge pull request #7196 from AndrewMeadows/simulation-ownership 
no expiry for simulation ownership
 2016-02-29 08:26:53 -08:00
Andrew Meadows
2591c5ee3e cleanup names that use "keyhole" 2016-02-25 18:09:35 -08:00
Stephen Birarda
34408c8144 Revert "verified domain ownership for full automatic networking" 2016-02-25 17:02:08 -08:00
Clément Brisset
2e7c7eace5 Merge pull request #7179 from birarda/domain-security 
verified domain ownership for full automatic networking
 2016-02-25 15:24:09 -08:00
Andrew Meadows
b4edfe2390 no expiry for simulation ownership 2016-02-25 12:07:20 -08:00
Thijs Wenker
a716d971d9 Merge branch 'master' of https://github.com/highfidelity/hifi into 20774_fix 2016-02-25 02:18:40 +01:00
Stephen Birarda
f553becabe data-server name tweak and isAgent behaviour change 2016-02-19 16:04:45 -08:00
Brad Hefta-Gaub
c699c828cd Merge pull request #7092 from birarda/assets-abs-path 
add setting to DS for asset path, handle absolute paths
 2016-02-12 17:43:23 -08:00
Andrew Meadows
2f2d1b5d22 Merge pull request #7076 from birarda/integrate-new-hrtf 
use injector not mixed count for inactivity
 2016-02-12 15:14:53 -08:00
Stephen Birarda
27d338e81c make any asset path relative to assets dir 2016-02-11 15:49:13 -08:00
Stephen Birarda
8eaea8a7ff clarify asset-server migration message 2016-02-11 15:42:35 -08:00
Stephen Birarda
f117bd5867 fix check for string assets path 2016-02-11 15:38:50 -08:00
Stephen Birarda
7c0b3953e4 handle custom path in asset-server for assets 2016-02-11 15:34:43 -08:00
Clément Brisset
911591c0ea Merge pull request #7082 from birarda/hrtf-map-crash 
fix for HRTF map crash
 2016-02-11 09:57:20 -08:00
Stephen Birarda
52cd4ae1a5 make sure the AudioMixerClientData exists before using it 2016-02-11 09:34:21 -08:00
Stephen Birarda
367e558b19 address PR comments for whitespace and constant 2016-02-11 09:30:07 -08:00
Stephen Birarda
f0ca412b29 use the existing not mixed count for injector inactivity 2016-02-10 18:22:57 -08:00
Stephen Birarda
edfb65acf6 more stats printing removal from audio-mixer 2016-02-10 17:38:56 -08:00
Stephen Birarda
6707535ced remove unused and incorrect stats from DS stats 2016-02-10 17:33:56 -08:00
Stephen Birarda
97cd65cf80 don't use usecTimestampNow for per second actions 2016-02-10 15:07:58 -08:00
Stephen Birarda
8598360f2e allow string values to be graphable in DS stats 2016-02-10 11:50:23 -08:00
Stephen Birarda
a9fc69b4ac cleanup percentage calculation for AM mix stats 2016-02-10 10:49:13 -08:00
Stephen Birarda
26fd0c305a push the length threshold to 1e-30 2016-02-09 17:14:23 -08:00
Stephen Birarda
a8841b475f specify float instead of implicitly converted double 2016-02-09 17:05:16 -08:00
Stephen Birarda
1a7738353a use a length check against source listener distance 2016-02-09 17:01:18 -08:00
Stephen Birarda
e0cb8db914 handle zero distance from listener to source 2016-02-09 16:51:23 -08:00
Stephen Birarda
87b85d6951 more useful stats for new HRTF mixer 2016-02-09 16:39:45 -08:00
Stephen Birarda
87d1d0a49c call renderSilent when audio-mixer is struggling 2016-02-09 15:30:51 -08:00
Stephen Birarda
95d0734d7f fix for windows size_t warning 2016-02-09 15:20:34 -08:00
Stephen Birarda
2cecfc499b correct azimuth for HRTF 2016-02-09 15:03:55 -08:00
Stephen Birarda
84b87b6f38 remove the unused AUDIO_MIXER_DEBUG define 2016-02-09 14:34:02 -08:00
Stephen Birarda
04dc55686b remove some comments for HRTF cleanup tests 2016-02-09 14:31:31 -08:00
Stephen Birarda
7b2726f89b ensure that injectors are cleaned up once inactive 2016-02-09 14:30:59 -08:00
Stephen Birarda
1773233af4 cleanup management of HRTF objects across connected Nodes 2016-02-09 14:30:44 -08:00
Stephen Birarda
a6a694c704 fix mixing bugs post HRTF integration 2016-02-09 11:58:55 -08:00
Stephen Birarda
1ce1a73f92 some concurrency repairs for AudioMixerClientData streams 2016-02-09 10:29:02 -08:00
Stephen Birarda
73690fe4cb use unique_ptr for audio streams in AudioMixerClientData 2016-02-08 18:45:14 -08:00
Stephen Birarda
fd96f0d960 leverage new HRTF in audio-mixer mix preparation 2016-02-08 18:12:25 -08:00
Stephen Birarda
445662f5ae clean sweep of old now unused audio files 2016-02-08 15:38:12 -08:00
James B. Pollack
3c9043987f Merge pull request #7019 from birarda/absolute-paths 
allow absolute path to entity-server persist file
 2016-02-04 08:53:21 -08:00
James B. Pollack
8b09cf3b82 Merge pull request #7024 from birarda/audio-mute-crash 
fix for audio-mixer mute env crash
 2016-02-04 08:53:10 -08:00
Andrew Meadows
63df34541d Merge pull request #6802 from huffman/agent-simulation 
Fix Agents bidding on simulation ownership
 2016-02-03 13:45:12 -08:00
Stephen Birarda
ea9d84bdc4 handle downloading of absolute persist file contents 2016-02-03 13:18:29 -08:00
Stephen Birarda
0e20392e66 remove debug for mute environment packet 2016-02-03 11:07:16 -08:00
Stephen Birarda
26abca92ae don't move the re-used mute environment packet 2016-02-03 10:55:07 -08:00
Stephen Birarda
2c1623ed42 use extension with preceeding period 2016-02-02 16:07:14 -08:00
Stephen Birarda
8ab15770b8 use absolutePath for absolute persist path 2016-02-02 15:52:12 -08:00
Stephen Birarda
99d1fa08fd handle incorrect casing in persist file extension 2016-02-02 15:49:40 -08:00
Stephen Birarda
90b78feb1e force models file to end in .json.gz 2016-02-02 15:37:34 -08:00
Stephen Birarda
4d91b8b7d6 fix check for existing persist file directory 2016-02-02 14:38:17 -08:00
Stephen Birarda
cfff765731 allow for absolute path handling at entity-server 2016-02-02 14:21:34 -08:00
Stephen Birarda
79dc2d5d55 add some debug for mute environment crash 2016-02-02 11:40:15 -08:00
Ryan Huffman
eff02d3e3a Fix Agents bidding on simulation ownership 2016-02-02 10:47:51 -08:00
Stephen Birarda
095f0b9349 rename canAdjustLocks to isAllowedEditor for multi-purpose 2016-02-01 16:46:11 -08:00
Stephen Birarda
0e016838b4 tweak size of values in AudioMixer 2016-01-29 14:04:45 -08:00
Howard Stearns
f00ec8de5d Merge pull request #6947 from huffman/fix-entity--mkdir 
Update entity server to always make resource directory if it does not…
 2016-01-27 13:03:00 -08:00
Ryan Huffman
a731a571e0 Update entity server to always make resource directory if it does not exist 2016-01-26 13:50:58 -08:00
Stephen Birarda
1e87fe77f2 return the result of PositionalAudioStream parseData 2016-01-25 13:47:20 -08:00
Stephen Birarda
7430b12db6 add some debug for stream overflows in audio-mixer 2016-01-25 13:30:19 -08:00
Stephen Birarda
cc96d90a21 Merge pull request #6897 from huffman/fix-asset-migration 
Fix asset server not creating resources directory before migrating
 2016-01-21 18:25:48 -08:00
Brad Hefta-Gaub
7bfe2730e8 Merge pull request #6849 from jherico/atmosphere 
Remove old atmosphere rendering
 2016-01-21 17:58:59 -08:00
Ryan Huffman
f9718931b0 Fix asset server not creating resources directory before migrating 2016-01-21 17:40:12 -08:00
Stephen Birarda
9127edc968 Merge pull request #6892 from huffman/fix-asset-migration 
Fix ATP file copy
 2016-01-21 17:15:46 -08:00
Brad Hefta-Gaub
094e41c993 Merge pull request #6888 from Atlante45/fix/wifi-ping-spikes 
Fix wifi ping spikes
 2016-01-21 17:07:38 -08:00
Ryan Huffman
99bb1fcbe1 Remove dirs from atp copy 2016-01-21 16:46:45 -08:00
Ryan Huffman
c9ea6e7eb6 Fix ATP file copy 2016-01-21 16:45:13 -08:00
Leonardo Murillo
a3ccf7014c Merge pull request #6890 from huffman/fix-asset-migration 
Fix asset server data migration
 2016-01-21 18:12:07 -06:00
Ryan Huffman
996f3f5df7 Fix entity server data migration to work with default persist filename 2016-01-21 15:43:45 -08:00
Ryan Huffman
e63ac03123 Fix asset server data migration 2016-01-21 15:26:52 -08:00
Brad Davis
b8109af196 Ignite the atmosphere 2016-01-21 15:15:15 -08:00
Atlante45
db18d188b8 Fix wifi ping spikes 
Moves the setting of Qt's bearer poll timeout earlier to be sure
it's caught.
 2016-01-21 15:05:32 -08:00
Leonardo Murillo
098b7a4ff3 Merge pull request #6870 from birarda/console 
Your Stack Manager is now a Server Console
 2016-01-21 14:31:34 -06:00
Stephen Birarda
7c9dc2e2bb add a comment for QProcess non-dangling pointer 2016-01-21 11:02:34 -08:00
Stephen Birarda
63da0074b4 repair the audio-mixer coma debug 2016-01-21 10:26:03 -08:00
Stephen Birarda
5e451360f7 add some debug for the next audio mixer coma 2016-01-20 18:22:37 -08:00
Ryan Huffman
c31ceeca86 Add deletion of old log files 2016-01-20 15:35:30 -08:00
Stephen Birarda
8bc063e758 Merge branch 'master' of https://github.com/highfidelity/hifi into console 2016-01-19 16:21:19 -08:00
Stephen Birarda
fdda93a62d set the build version on assignment-client 2016-01-19 16:04:41 -08:00
Ryan Huffman
4ce20242b1 Fix asset server data migration 2016-01-19 15:50:45 -08:00
Ryan Huffman
37cfac404e Move octree server data directory to /web 2016-01-19 15:23:14 -08:00
Ryan Huffman
58344416fd Remove extra whitespace 2016-01-19 15:16:17 -08:00
Ryan Huffman
84f4b4b935 Remove dead code 2016-01-19 15:15:54 -08:00
Ryan Huffman
4afb6992c3 Move entities resources into /entities 2016-01-19 14:41:57 -08:00
Ryan Huffman
c417bc0fb3 Move asset resource directory out of /resources 2016-01-19 14:41:57 -08:00
Stephen Birarda
fcaf38cc57 don't set AC version for data directory fix 2016-01-15 15:56:47 -08:00
Stephen Birarda
0876da7a7d call manual install of ssleay from console install 2016-01-15 15:41:34 -08:00
Stephen Birarda
cf5b6198fd use install command to manually place ssleay library 2016-01-15 15:41:34 -08:00
Stephen Birarda
05e48528bd make sure SSL_EAY_LIBRARY_* is set when used 2016-01-15 15:41:34 -08:00
Stephen Birarda
c1a9a7f4c1 add ssleay copy for win AC/DS/Interface 2016-01-15 15:41:34 -08:00
Stephen Birarda
0b118a8e98 replace ApplicationVersion with BuildInfo 2016-01-15 15:41:34 -08:00