Commit graph

1951 commits

Author SHA1 Message Date
Stephen Birarda
bfb9801b22 Merge branch 'atp' of github.com:birarda/hifi into atp-mappings 2016-03-08 11:37:27 -08:00
Stephen Birarda
7bf6b8405c pluralize mappings in AssetServer naming 2016-03-08 10:28:59 -08:00
Ryan Huffman
89b37f78f0 Make AssetServer response reliable and ordered 2016-03-08 10:26:50 -08:00
Ryan Huffman
7db296fa69 Remove unused get/set/deleteMapping in AssetServer 2016-03-08 10:23:48 -08:00
Ryan Huffman
88760d389f Merge branch 'master' of https://github.com/highfidelity/hifi into atp-mappings 2016-03-08 10:21:32 -08:00
Stephen Birarda
a3533b0b7d repairs for moved packet handling in AssetServer 2016-03-08 10:21:29 -08:00
Stephen Birarda
fa04f08c4c use toHex/fromHex for more compact messaging 2016-03-08 10:01:54 -08:00
Stephen Birarda
da3e3b7e6c add handle calls for mapping operations 2016-03-08 09:55:48 -08:00
Ryan Huffman
37c0417ea6 Add GetAll and Delete mapping requests 2016-03-07 16:31:49 -08:00
Stephen Birarda
12a774d47f return error if persistence fails for set/delete operations 2016-03-07 15:46:44 -08:00
Stephen Birarda
5aa287a789 handle read/write to asset-server map file 2016-03-07 15:30:30 -08:00
Stephen Birarda
82cd8aed8c protect mapping clobbering when migrating 2016-03-07 14:46:54 -08:00
Stephen Birarda
18b22cbd16 add a mapping for pre-mapping migrated files 2016-03-07 14:43:17 -08:00
Stephen Birarda
9d61de6cd5 add a mapping migration for pre-mapping assets 2016-03-07 14:38:55 -08:00
Stephen Birarda
7bb97ec3da add an extra space before debug in AssetServer 2016-03-07 13:57:12 -08:00
Stephen Birarda
e7124d4b10 add server handling for no extension requests 2016-03-07 13:57:11 -08:00
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