Atlante45
|
0c7f5250f3
|
Update isCorrupted with name indexing
|
2018-02-20 11:48:25 -08:00 |
|
Zach Fox
|
11f897beb0
|
Initial app support
|
2018-02-20 10:39:36 -08:00 |
|
Stephen Birarda
|
3401882dc7
|
Merge pull request #12441 from huffman/feat/corrupted-upload
Add corrupted backup status to domain content backup info
|
2018-02-20 11:25:30 -07:00 |
|
Ryan Huffman
|
479dfaf330
|
Add corrupted backup status to domain content backup info
|
2018-02-20 10:18:12 -08:00 |
|
John Conklin II
|
6148c407a5
|
Merge pull request #12422 from misslivirose/fix-overlay-lines
Show outline for zones when rotating
|
2018-02-20 09:30:22 -08:00 |
|
John Conklin II
|
aa67a98d02
|
Merge pull request #12426 from ElderOrb/FB11508
fix for toolbar slowly drifting on switching between HMD/Desktop modes
|
2018-02-20 09:30:01 -08:00 |
|
humbletim
|
5791ca4c51
|
interim checkin
|
2018-02-20 12:22:04 -05:00 |
|
David Rowe
|
44aafd92a4
|
Merge branch 'master' into 21757
# Conflicts:
# scripts/system/html/js/entityProperties.js
|
2018-02-20 17:34:59 +13:00 |
|
ZappoMan
|
76d611d563
|
Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters
|
2018-02-19 19:15:33 -08:00 |
|
Nissim Hadar
|
b2a06cdb98
|
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
# Conflicts:
# libraries/entities/src/EntityItemProperties.cpp
# libraries/entities/src/ShapeEntityItem.h
# libraries/networking/src/udt/PacketHeaders.cpp
# libraries/networking/src/udt/PacketHeaders.h
|
2018-02-19 13:05:57 -08:00 |
|
Nissim Hadar
|
9921217807
|
Shapes casting shadows OK.
|
2018-02-19 12:32:11 -08:00 |
|
Nissim Hadar
|
6a9bbaf0a5
|
WIP - clean-up.
|
2018-02-19 12:00:30 -08:00 |
|
Sam Gateau
|
fd49c0d100
|
Merge pull request #12401 from SamGondelman/decals
Material Entities
|
2018-02-19 10:58:02 -08:00 |
|
David Rowe
|
65efeadf10
|
Fix selecting values when tabbing between entity properties fields
|
2018-02-19 19:17:23 +13:00 |
|
Brad Hefta-Gaub
|
0ef2794c35
|
Merge pull request #12395 from druiz17/fix-qml-tablet-apps
Prevent adding the same tablet url to the tabletApps list
|
2018-02-18 19:10:24 -08:00 |
|
Brad Hefta-Gaub
|
a4783ded15
|
Merge pull request #12414 from hyperlogic/bug-fix/scramlbed-avaatrs
Bug fix for Scrambled Avatars
|
2018-02-18 19:06:53 -08:00 |
|
Brad Hefta-Gaub
|
d0b0fcba9a
|
Merge pull request #12436 from cain-kilgore/patch-1
Fixed extra " in backup_instructions.html
|
2018-02-18 19:06:24 -08:00 |
|
Nissim Hadar
|
81c9e449e6
|
Models casting shadows (again). (Something stupid happened...)
|
2018-02-18 10:19:17 -08:00 |
|
Seth Alves
|
0a92596452
|
don't rely on return value of pendingDatagramSize() when hasPendingDatagrams() is false
|
2018-02-18 10:04:22 -08:00 |
|
Seth Alves
|
3027d3461e
|
Qt 5.10 seems to indicate pendingDatagramSizes of 0. Reading from these would block and causes an QAbstractSocket::TemporaryError to be thrown
|
2018-02-17 15:24:50 -08:00 |
|
Nissim Hadar
|
a69816f885
|
WIP.
|
2018-02-17 15:21:57 -08:00 |
|
Cain Kilgore
|
47ed45b5e9
|
Fixed extra " in backup_instructions.html
|
2018-02-17 18:14:44 +00:00 |
|
vladest
|
e5f953c103
|
Make sure Flickable for GridView for TabletHome will not flick
|
2018-02-17 16:52:32 +01:00 |
|
Nissim Hadar
|
7ba8a9935a
|
No extraneous shadows.
|
2018-02-16 19:23:31 -08:00 |
|
Nissim Hadar
|
dc3b03c9bc
|
Added shadows to shapes - still sucks...
|
2018-02-16 18:37:47 -08:00 |
|
Stephen Birarda
|
3f75bf62d5
|
check for recovery complete always, reload content page on restore
|
2018-02-16 18:03:16 -08:00 |
|
Nissim Hadar
|
4d4e3d6aae
|
Merge branch 'shadowControlsOffZvork' of https://github.com/NissimHadar/hifi into shadowControlsOffZvork
|
2018-02-16 18:00:10 -08:00 |
|
Stephen Birarda
|
769d5677b1
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings
|
2018-02-16 17:41:14 -08:00 |
|
Stephen Birarda
|
93d9e962fb
|
Merge pull request #12433 from Atlante45/feat/backups-integration
Fix filename not being passed in correctly
|
2018-02-16 18:39:19 -07:00 |
|
Atlante45
|
85c1739df4
|
Fix filename not being passed in correctly
|
2018-02-16 17:37:29 -08:00 |
|
Stephen Birarda
|
1e36a5b218
|
Merge pull request #12430 from birarda/feat/pending-content-archives
make filename regex less restrictive
|
2018-02-16 18:21:56 -07:00 |
|
Stephen Birarda
|
df236aaeb0
|
Merge pull request #12431 from Atlante45/feat/backups-integration
Index backups by filename
|
2018-02-16 18:21:30 -07:00 |
|
Stephen Birarda
|
5dd74674ef
|
fix spinner and restart behaviour for manual content upload
|
2018-02-16 17:18:28 -08:00 |
|
Atlante45
|
c61aa4bf95
|
Pass in backup name to handler
|
2018-02-16 17:16:31 -08:00 |
|
Stephen Birarda
|
2faa67c68d
|
make filename regex less restrictive
|
2018-02-16 17:01:46 -08:00 |
|
Atlante45
|
acc68d65c2
|
Backup bug fixes
|
2018-02-16 16:59:12 -08:00 |
|
Stephen Birarda
|
42afdd6502
|
Merge pull request #12429 from birarda/feat/pending-content-archives
availability and restore progress for content archives, move perm defaults, add settings manager thread safety
|
2018-02-16 17:39:16 -07:00 |
|
Stephen Birarda
|
9af7579b85
|
handle change for programmatic input change badging
|
2018-02-16 16:32:21 -08:00 |
|
Stephen Birarda
|
4c10dcba96
|
match previous behavior in DomainGatekeeper
|
2018-02-16 16:06:29 -08:00 |
|
Stephen Birarda
|
c8308efa0c
|
put back more broad header for content upload
|
2018-02-16 16:04:52 -08:00 |
|
Stephen Birarda
|
9057918e08
|
move default security permissions to describe-settings.json
|
2018-02-16 16:01:40 -08:00 |
|
Stephen Birarda
|
dd5b08bdc1
|
fix unlock of locker not mutex, don't pack permission defaults
|
2018-02-16 16:01:40 -08:00 |
|
Stephen Birarda
|
679513599c
|
fix row hiding and paste events for badging
|
2018-02-16 16:01:40 -08:00 |
|
Stephen Birarda
|
1c053730eb
|
make DomainServerSettingsManager thread-safe for use in content backup
|
2018-02-16 16:01:40 -08:00 |
|
Stephen Birarda
|
d9f2e1986f
|
set DomainContentBackupManager object name so it appears on thread
|
2018-02-16 16:01:40 -08:00 |
|
Stephen Birarda
|
8e621a95a3
|
fix typo in debug for writing new entities
|
2018-02-16 16:01:40 -08:00 |
|
Stephen Birarda
|
441b55301f
|
cleanup LNL last during DS shutdown
|
2018-02-16 16:01:40 -08:00 |
|
Stephen Birarda
|
494f93304b
|
take down AssetClient after content manager
|
2018-02-16 16:01:40 -08:00 |
|
Stephen Birarda
|
5dec3aba50
|
fix download link and restore behaviour with pending
|
2018-02-16 16:01:40 -08:00 |
|
Stephen Birarda
|
faacd986b3
|
remove deleted backups from content archives tables
|
2018-02-16 16:01:40 -08:00 |
|