Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 12:31:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
40571 commits 75 branches 59 tags 1.2 GiB
Commit graph

40571 commits

This branch
This branch
All branches
Author SHA1 Message Date
Clément Brisset
ac7cbbd960 Merge pull request #106 from birarda/atp-mappings 
add overwriting of files during upload if hash doesn't match
 2016-03-11 13:27:07 -08:00
Stephen Birarda
1502348731 Merge pull request #105 from Atlante45/feat/atp 
Disable asset browser if user can't rez
 2016-03-11 13:25:28 -08:00
Stephen Birarda
630f5303b2 overwrite existing asset during upload if hash doesn't match 2016-03-11 13:23:57 -08:00
Clément Brisset
e5376b1229 Merge pull request #104 from birarda/atp-mappings 
handle failed file write errors in AssetServer
 2016-03-11 13:20:46 -08:00
Atlante45
7efe26e854 Disable asset browser if user can't rez 2016-03-11 11:53:14 -08:00
Stephen Birarda
85e203e2cb return an empty string for no error 2016-03-11 11:44:46 -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
Clément Brisset
4bb3314d87 Merge pull request #103 from birarda/atp-mappings 
fix for selected index crashes
 2016-03-10 18:36:29 -08:00
Stephen Birarda
7ccba8b406 remove debug for selected index crash 2016-03-10 18:36:12 -08:00
Stephen Birarda
7675c83f92 clear selection on reload 2016-03-10 18:34:28 -08:00
Stephen Birarda
8e2b06a8e5 use an explicit selection model for treeview 2016-03-10 18:32:18 -08:00
Clément Brisset
843bff1dcf Merge pull request #102 from birarda/atp-mappings 
append a trailing slash for folder rename
 2016-03-10 18:04:11 -08:00
Stephen Birarda
39e869fdfd append a trailing slash for folder rename 2016-03-10 17:54:38 -08:00
Clément Brisset
4d2797c25a Merge pull request #101 from birarda/atp-mappings 
fix add to world after upload name change
 2016-03-10 17:15:13 -08:00
Stephen Birarda
625032f748 fix for add to world after upload name change 2016-03-10 17:10:49 -08:00
Clément Brisset
49ce6a87fe Merge pull request #100 from birarda/atp-mappings 
add to world on upload, trim for paths
 2016-03-10 17:00:35 -08:00
Stephen Birarda
6f550292f4 pass delete paths by reference for trimming 2016-03-10 16:57:39 -08:00
Stephen Birarda
6ae5ed6588 add trimming to MappingRequest ctors 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
52ee2499fc add trim prior to rename in AssetServer 2016-03-10 16:57:39 -08:00
Stephen Birarda
979fda7c8b add trimming for upload mapping 2016-03-10 16:57:39 -08:00
Stephen Birarda
ed4df72eed cleanup logging for asset browser 2016-03-10 16:57:39 -08:00
Stephen Birarda
96a112290f use mapping for overwrite prompt 2016-03-10 16:56:22 -08:00
Stephen Birarda
d52c904070 Merge pull request #98 from Atlante45/feat/atp 
Don't overwrite directories
 2016-03-10 16:56:14 -08:00
Atlante45
4a9d88d213 CR 2016-03-10 16:55:51 -08:00
Atlante45
16287b7040 Disable add to world for uncompatible files 2016-03-10 16:44:39 -08:00
Atlante45
35f5ebb938 Don't allow folder overwrite 2016-03-10 16:44:39 -08:00
Stephen Birarda
2fb478ff3c Merge pull request #99 from huffman/atp-more 
Atp more
 2016-03-10 16:22:05 -08:00
Ryan Huffman
ad0fb18d81 Add / to beginning of mapping on upload if missing 2016-03-10 16:02:41 -08:00
Clément Brisset
37449613b7 Merge pull request #97 from birarda/atp-mappings 
don't default to yes when prompted for overwrite
 2016-03-10 15:57:57 -08:00
Ryan Huffman
2d4864ed33 Merge branch 'atp' of github.com:birarda/hifi into atp-more 2016-03-10 15:40:07 -08:00
Ryan Huffman
76ed16314a Add prepended slash on rename if missing 2016-03-10 15:38:20 -08:00
Ryan Huffman
76152906be Fix crash bug in asset manager 2016-03-10 15:37:38 -08:00
Stephen Birarda
e29565a717 don't default to yes when prompted for overwrite 2016-03-10 15:32:12 -08:00
Stephen Birarda
672bafc09d Merge pull request #95 from Atlante45/feat/atp 
Wire upload
 2016-03-10 15:30:53 -08:00
Atlante45
a6ccfb1685 CR 2016-03-10 15:11:39 -08:00
Stephen Birarda
2f2b6de7ff Merge pull request #96 from birarda/atp-mappings 
add text centering by default to message dialog
 2016-03-10 15:04:16 -08:00
Stephen Birarda
cf12a8d396 always center the text in the message dialog 2016-03-10 15:02:19 -08:00
Atlante45
63571a7c36 Make sure Upload is not clicked several times 2016-03-10 14:59:20 -08:00
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
Atlante45
dc79d3262a Update glyphs font 2016-03-10 14:59:20 -08:00
Ryan Huffman
3c748689a1 Merge pull request #94 from birarda/atp-mappings 
clearer error message handling
 2016-03-10 14:55:46 -08:00
Stephen Birarda
b3d8b67893 remove committed debug lines 2016-03-10 14:50:21 -08:00
Stephen Birarda
7f0917ea00 add to world in front of MyAvatar 2016-03-10 14:49:07 -08:00
Stephen Birarda
e227f68353 tweak wording for overwrite dialog 2016-03-10 14:49:07 -08:00
Stephen Birarda
5167cf69b2 fix for add to world and delete dialog 2016-03-10 14:49:07 -08:00
Stephen Birarda
d077ade350 fix path regex to handle leading double slash 2016-03-10 14:48:44 -08:00
Stephen Birarda
e93bc8317f remove an extra space 2016-03-10 14:48:44 -08:00