Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-24 23:49:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
44807 commits 74 branches 59 tags 1.2 GiB
Commit graph

2067 commits

Author SHA1 Message Date
Stephen Birarda
190d11e0bf rename the set of hashes to check for deletion 2016-04-11 17:16:52 -07:00
Stephen Birarda
026f58c866 don't perform asset cleanup if mapping file load fails 2016-04-11 17:14:31 -07:00
Stephen Birarda
334dc3cb6c cleanup left file debug, add check for deleted mapping 2016-04-11 09:05:11 -07:00
Stephen Birarda
775898893b add deletion of unmapped files during delete op 2016-04-11 08:57:07 -07:00
Stephen Birarda
fae9b061a3 promote a debug to info 2016-04-11 08:42:52 -07:00
Stephen Birarda
4d0976f730 remove migration code for pre-mapping migrations 2016-04-11 08:41:42 -07:00
Stephen Birarda
bf3324fc6b hold download of ATP script if Asset Server isn't ready 2016-04-08 15:28:12 -07:00
Stephen Birarda
1df0dce971 use ResourceRequest in Agent to handle ATP scripts 2016-04-08 14:38:26 -07:00
Brad Hefta-Gaub
40e53baa79 Merge pull request #7597 from Atlante45/fix/script-sound-hold-strong-ref 
Fix audio injectors not working
 2016-04-06 16:57:29 -07:00
Atlante45
6d1b7f1d37 Wrap sound script object to hold a strong ref 2016-04-06 13:04:18 -07:00
Ryan Huffman
29c287227c Fix AssignmentClient unpacking an assignment when it already has one 2016-04-05 15:30:53 -07:00
Seth Alves
6025a66fa1 Merge pull request #7532 from Atlante45/feat/delayed-decrease 
Delay congestion epochs first decrease
 2016-04-01 18:07:43 -07:00
Atlante45
86b425143b Use Mbps for max bandwith 2016-03-31 11:03:06 -07:00
Stephen Birarda
882a0272c0 add simple cleanup of unmapped assets on start 2016-03-31 09:54:30 -07:00
howard-stearns
c6347eb92a checkpoint for debugging/comparing edit.js 2016-03-28 13:39:43 -07:00
Ken Cooke
063891d65e remove dead code 2016-03-24 13:29:57 -07:00
Ken Cooke
c6ca984782 Fix Reverb Zone settings to work correctly with new reverb. 2016-03-24 12:59:52 -07:00
Brad Hefta-Gaub
8c290ea6b9 Merge pull request #7390 from Atlante45/feat/udp-flood-protection 
Server side bandwidth dial
 2016-03-23 11:47:41 -07:00
Atlante45
d5f6ca5e1c Add max bandwidth setting 2016-03-21 14:50:18 -07:00
Brad Hefta-Gaub
492e71345a Revert "Revert "Fix ModelBlender crash"" 
This reverts commit f274cdcc7f.
 2016-03-21 11:42:25 -07:00
Brad Hefta-Gaub
f274cdcc7f Revert "Fix ModelBlender crash" 2016-03-21 10:47:31 -07:00
Brad Hefta-Gaub
7483b8546b remove FaceModel, make Model support shared_from_this() so we can ave shared and weak pointers to it 2016-03-17 17:05:35 -07:00
Stephen Birarda
92b287355c make TRUNCATED_HASH_NUM_CHAR a non-static const 2016-03-15 15:56:13 -07:00
Stephen Birarda
b13dff1c77 Revert "remove redundant static from const in AssetServer" 
This reverts commit 0837261d403e844f648f4f4ddcce7d7b79c7083b.
 2016-03-15 14:38:08 -07:00
Stephen Birarda
29cd487f84 fixes for styling and logging from CR 2016-03-15 14:38:08 -07:00
Stephen Birarda
b8abb1b6dd remove redundant static from const in AssetServer 2016-03-15 14:38:08 -07:00
Stephen Birarda
72c64532f5 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-15 09:12:49 -07:00
Seth Alves
0a2fb77698 delete child entities when parent is deleted 2016-03-13 07:04:50 -07:00
Stephen Birarda
630f5303b2 overwrite existing asset during upload if hash doesn't match 2016-03-11 13:23:57 -08:00
Stephen Birarda
e51aedeb35 fix error handling for diff request types 2016-03-11 11:36:52 -08:00
Stephen Birarda
9522c2d17c add file open and write error handling 2016-03-11 11:04:34 -08:00
Stephen Birarda
6f550292f4 pass delete paths by reference for trimming 2016-03-10 16:57:39 -08:00
Stephen Birarda
e94e2ece2e add trimming to paths on asset server 2016-03-10 16:57:39 -08:00
Stephen Birarda
e93bc8317f remove an extra space 2016-03-10 14:48:44 -08:00
Stephen Birarda
50a05df721 fix asset loading with error changes 2016-03-10 11:58:57 -08:00
Stephen Birarda
99718e9c4e short circuit the mapping operations for invalid path/hash 2016-03-10 10:52:05 -08:00
Stephen Birarda
ae3c0f6646 add hash and path checking 2016-03-09 18:03:44 -08:00
Stephen Birarda
672f8ec1f7 add checking for leading slash in mapping operations 2016-03-09 17:43:31 -08:00
Stephen Birarda
7b08ae3747 drop invalid mappings on AssetServer load 2016-03-09 17:30:02 -08:00
Clément Brisset
aeee89eb15 Merge pull request #86 from birarda/atp-mappings 
disable client caching of ATP mappings, fix bug retreiving assets
 2016-03-09 14:40:57 -08:00
Stephen Birarda
e2b976d9f1 remove debug, fix asset find bug for incorrect folder 2016-03-09 14:24:35 -08:00
Stephen Birarda
a986403237 add a leading slash for faked migrated mappings 2016-03-09 13:42:35 -08:00
Stephen Birarda
d3dc81c7a0 add delete debug, handle rename in memory state rollback 2016-03-09 13:37:39 -08:00
Stephen Birarda
5e9751c6ed bug fixes for rename/delete operations 2016-03-09 13:28:05 -08:00
Stephen Birarda
a65d06c7ce fix rename to take old mapping first 2016-03-09 13:14:55 -08:00
Stephen Birarda
4bbb8779e3 Merge branch 'atp' of github.com:birarda/hifi into atp-rename-mapping 2016-03-09 12:17:24 -08:00
Stephen Birarda
6b8a71f96a add debug for mapping operations 2016-03-09 12:16:36 -08:00
Stephen Birarda
a53b038ac2 add folder delete handling 2016-03-09 12:10:36 -08:00
Stephen Birarda
03c38eada3 add folder rename handling 2016-03-09 12:06:33 -08:00
Clément Brisset
3f50abcd17 Merge pull request #82 from birarda/atp-rename-mapping 
add rename mapping operation for atomic rename
 2016-03-09 11:57:20 -08:00
Stephen Birarda
87d5958eb8 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-08 17:11:18 -08:00
Stephen Birarda
6abd1c50b2 remove the inlined writeError in AssetServer 2016-03-08 15:45:13 -08:00
Brad Hefta-Gaub
8d4ef28411 CR feedback 2016-03-08 15:29:04 -08:00
Stephen Birarda
33cadb36da add server side handling for mapping rename 2016-03-08 14:57:22 -08:00
Brad Hefta-Gaub
35d6afbe77 Merge branch 'master' of https://github.com/highfidelity/hifi into fixSceneNotStable 2016-03-08 14:53:41 -08:00
Brad Hefta-Gaub
6d211dd4e5 first cut at fixing the scene not stable bug 2016-03-08 14:52:21 -08:00
Stephen Birarda
793d20306d handle multiple paths for mapping delete operations 2016-03-08 14:24:03 -08:00
Stephen Birarda
8fa32e75b2 client side fixes for upload with no extension 2016-03-08 12:19:15 -08:00
Stephen Birarda
1ece9aac26 remove extension from asset upload task 2016-03-08 12:08:02 -08:00
Stephen Birarda
7cc774c5f4 indentation fix for _filesDirectory in AssetServer 2016-03-08 11:55:29 -08:00
Stephen Birarda
c4845e5ae5 remove getMapping call from AssetServer that is unused 2016-03-08 11:50:23 -08:00
Stephen Birarda
4608eddb40 remove an extra blank line 2016-03-08 11:47:55 -08:00
Stephen Birarda
7ecfc20dc2 add error handling for asset-server files directory 2016-03-08 11:47:11 -08:00
Stephen Birarda
4236d8e147 replace toLocal8Bit with toUtf8 for hex conversions 2016-03-08 11:40:35 -08:00
Stephen Birarda
063826638e move handling of get all operation to sep method 2016-03-08 11:39:28 -08:00
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
Stephen Birarda
ed9faf4189 add a secondary check for local IP address 2016-03-07 18:00:09 -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