Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 06:20:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
40669 commits 25 branches 0 tags 1.1 GiB
Commit graph

40669 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Brad Hefta-Gaub
92c47fdc8b fix build buster, CR feedback 2016-03-10 16:44:59 -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
Brad Hefta-Gaub
387c156ce3 add failsafe for fade, so it can't endup between start and end property value 2016-03-10 16:24:30 -08:00
Stephen Birarda
2fb478ff3c Merge pull request #99 from huffman/atp-more 
Atp more
 2016-03-10 16:22:05 -08:00
Howard Stearns
8a36df13df Merge pull request #7314 from samcake/color 
Fix a potentially bad access to RenderItem case from Overlay
 2016-03-10 16:19:56 -08:00
Brad Hefta-Gaub
9842689ec0 remove noise and return early 2016-03-10 16:19:52 -08:00
Brad Hefta-Gaub
0c12c6ef90 dont be an idiot 2016-03-10 16:14:56 -08:00
Brad Hefta-Gaub
ff30611234 first cut at getting overlays to toggle again 2016-03-10 16:07:49 -08:00
Ryan Huffman
ad0fb18d81 Add / to beginning of mapping on upload if missing 2016-03-10 16:02:41 -08:00
samcake
a88f22fa3c Removing white spaces 2016-03-10 15:58:04 -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
Brad Davis
e452020126 Better threaded handling of QML overlays 2016-03-10 15:50:07 -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
Brad Davis
bbc298f1e4 Merge pull request #7306 from zzmp/fix/px-rapid 
Allow procedural shaders to be reused, and prevent crashes from rapid updates
 2016-03-10 15:34:48 -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
Zach Pomerantz
505ae71e30 Pass px userData by const ref 2016-03-10 15:22:19 -08:00
Anthony J. Thibault
c0880a570e Stats: fix for avatar velocity stat being stuck at 0.1 2016-03-10 15:15:46 -08:00
Atlante45
a6ccfb1685 CR 2016-03-10 15:11:39 -08:00
samcake
fb68c09941 Before merging upstream 2016-03-10 15:10:34 -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
samcake
3944a7f297 Exposing thread safe number of allocated items for a ascene 2016-03-10 15:03:20 -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
Stephen Birarda
c65b5b63f0 better error handling for asset browser 2016-03-10 14:48:44 -08:00
Stephen Birarda
1678c9be20 add a keyboard shortcut for the asset directory 2016-03-10 14:48:44 -08:00
Stephen Birarda
8cc0ae3148 menu and naming changes for asset server directory 2016-03-10 14:48:44 -08:00
Stephen Birarda
6193bdb483 Merge pull request #93 from huffman/atp-more 
Add context menu to asset manager
 2016-03-10 14:47:32 -08:00
Ryan Huffman
c93ba2752b Remove rowDelegate styling for asset window 2016-03-10 14:44:53 -08:00
Ryan Huffman
e4b5c14a4c Merge branch 'atp' of github.com:birarda/hifi into atp-more 2016-03-10 14:20:22 -08:00