Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-19 21:49:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
40552 commits 25 branches 0 tags 1.1 GiB
Commit graph

2360 commits

Author SHA1 Message Date
Atlante45
548d826a4e Couple bug fixes 2016-03-10 14:59:20 -08:00
Atlante45
7d7a683b18 Add uploadFile method that prompts the user 2016-03-10 14:59:20 -08:00
Stephen Birarda
d077ade350 fix path regex to handle leading double slash 2016-03-10 14:48:44 -08:00
Stephen Birarda
5ad4645b47 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-10 13:28:59 -08:00
Stephen Birarda
50a05df721 fix asset loading with error changes 2016-03-10 11:58:57 -08:00
Stephen Birarda
9c53f40fbe remove nullptr check in AssetMappingsScriptingInterface 2016-03-10 10:52:05 -08:00
Stephen Birarda
2bbeac6597 short circuit asset request for invalid hash 2016-03-10 10:52:05 -08:00
Stephen Birarda
9d19bf85b1 add consistent error handling for asset request and upload 2016-03-10 10:52:05 -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
Ryan Huffman
0d2ae4f3a4 Merge branch 'atp' of github.com:birarda/hifi into atp-model 2016-03-09 16:33:53 -08:00
Ryan Huffman
d299ce2677 Fix missing semicolon 2016-03-09 14:56:56 -08:00
Ryan Huffman
f5497aa1e7 Add new AssetMappingsScriptingInterface and add mappings model 2016-03-09 14:53:04 -08:00
Stephen Birarda
96ba57a946 remove client side caching of ATP mappings 2016-03-09 14:24:14 -08:00
Ryan Huffman
64bd41c37f Add AssetMappingItem and extra data to items 2016-03-09 14:03:56 -08:00
Ryan Huffman
4da4fd889a Add AssetMappingModel 2016-03-09 14:03:56 -08:00
Ryan Huffman
38edfe0557 Fix GetAllMappings reading 2016-03-09 14:03:56 -08:00
Ryan Huffman
fd5a5dd8f4 Add QJSEngine compatible AssetMappingScriptInterface 2016-03-09 14:03:25 -08:00
Stephen Birarda
2e9ee4f8a7 Merge branch 'atp' of github.com:birarda/hifi into atp 2016-03-09 12:16:59 -08:00
Stephen Birarda
9a2b2b4c16 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-09 12:16:46 -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
Zach Pomerantz
54af58834a Mark Resource loaded after postprocessing 2016-03-09 10:34:07 -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
8d5111a332 move MappingRequest and subclasses to separate file 2016-03-08 15:30:59 -08:00
Stephen Birarda
181b20f673 move the AssetScriptInterface to script-engine 2016-03-08 14:49:26 -08:00
Stephen Birarda
f9f42a085a add client side handling for mapping rename 2016-03-08 14:43:55 -08:00
Stephen Birarda
793d20306d handle multiple paths for mapping delete operations 2016-03-08 14:24:03 -08:00
Zach Pomerantz
925ea8bcda Add Resource::isCacheable 2016-03-08 13:30:58 -08:00
Stephen Birarda
cf5de317ba use correct error handling for MappingRequest errors 2016-03-08 12:21:54 -08:00
Stephen Birarda
1ece9aac26 remove extension from asset upload task 2016-03-08 12:08:02 -08:00
Stephen Birarda
e92a9c9741 fix comment for asset packet version push 2016-03-08 11:53:53 -08:00
Stephen Birarda
88c1892bf6 remove a comment block re-added in merge 2016-03-08 11:51:59 -08:00
Stephen Birarda
8107287e6c remove start from mapping request subclasses 2016-03-08 11:42:57 -08:00
Stephen Birarda
bfb9801b22 Merge branch 'atp' of github.com:birarda/hifi into atp-mappings 2016-03-08 11:37:27 -08:00
Ryan Huffman
5368ae3f91 Remove extraneous thread checks in MappingRequest subclasses 2016-03-08 11:20:15 -08:00
Ryan Huffman
93d3fb5ccf Fix network error response for mapping requests 2016-03-08 11:19:08 -08:00
Ryan Huffman
c9bd67bc3e Add MappingRequest superclass and mapping specific errors 2016-03-08 11:18:10 -08:00
Ryan Huffman
e06c1591fb Remove initializer 2016-03-08 10:43:26 -08:00
Ryan Huffman
0a75a94790 Remove commented out private slot 2016-03-08 10:31:40 -08:00
Ryan Huffman
e3523c8604 Remove commented out function 2016-03-08 10:28:31 -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
Ryan Huffman
6ca4b72479 Add deleteMapping to asset scripting interface 2016-03-08 10:11:57 -08:00
Ryan Huffman
a18486d97d Fix GetAllMappingsRequest not storing mappings 2016-03-08 10:11:37 -08:00
Ryan Huffman
cf9d4c256a Add proper cache checking to GetAssetMapping 2016-03-08 10:10:48 -08:00
Stephen Birarda
bf8a2bc9e5 update read for get mapping to toHex 2016-03-08 10:03:29 -08:00
Stephen Birarda
909979bab9 fix SLOT connection for local address check 2016-03-08 09:11:38 -08:00
Stephen Birarda
73b7e787d3 change signature of errorTestingLocalSocket 2016-03-08 09:09:28 -08:00
Stephen Birarda
20ab108d51 remove some debug for local socket check error 2016-03-07 18:01:57 -08:00
Stephen Birarda
ed9faf4189 add a secondary check for local IP address 2016-03-07 18:00:09 -08:00