Ryan Huffman
|
ec210e1750
|
Move OctreeUtils to OctreeDataUtils
|
2018-02-26 16:51:42 -08:00 |
|
Ryan Huffman
|
3fa538d42d
|
Add RawEntityData subclass
|
2018-02-26 16:32:09 -08:00 |
|
Ryan Huffman
|
975bfa6809
|
Clean up std::chrono usage in DomainContentBackupManager
|
2018-02-26 15:39:33 -08:00 |
|
Ryan Huffman
|
f23f751e80
|
Add check to make sure entity data gets written to zip
|
2018-02-26 15:27:24 -08:00 |
|
Ryan Huffman
|
65a4b3d316
|
Revert change to packet reading in Socket.cpp
|
2018-02-26 14:43:50 -08:00 |
|
Ryan Huffman
|
cd9cdea3e8
|
Update backup formats to filter out non-whitelisted characters
|
2018-02-26 14:29:13 -08:00 |
|
Ryan Huffman
|
dbfbee5406
|
CR
|
2018-02-26 13:53:20 -08:00 |
|
Stephen Birarda
|
b18d5db062
|
Merge pull request #12495 from huffman/fix/baking-stuck
Fix/baking stuck
|
2018-02-23 15:19:29 -07:00 |
|
Ryan Huffman
|
c368c84f59
|
Make BakeAssetTask::abort thread-safe
|
2018-02-23 11:06:11 -08:00 |
|
Stephen Birarda
|
85bd0442a7
|
Merge pull request #12488 from Atlante45/feat/backups-integration
Merge master into content archives PR
|
2018-02-23 11:19:42 -07:00 |
|
Atlante45
|
c106fee659
|
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/backups-integration
|
2018-02-22 19:45:43 -08:00 |
|
Stephen Birarda
|
4c44bcfdba
|
Merge pull request #12487 from Atlante45/feat/backups-integration
Actually remove Backup from list during delete
|
2018-02-22 20:22:43 -07:00 |
|
Atlante45
|
eeda07bba6
|
Actually remove Backup from list during delete
|
2018-02-22 19:19:39 -08:00 |
|
Stephen Birarda
|
32830cbcd3
|
Merge pull request #12486 from Atlante45/feat/backups-integration
Never delete assets on load
|
2018-02-22 19:49:19 -07:00 |
|
Clément Brisset
|
0e5e63bf03
|
Merge pull request #12481 from birarda/feat/content-settings
immediately show restore, set restore filename, cleanup old AS baked content on start
|
2018-02-22 18:41:13 -08:00 |
|
Atlante45
|
cbabca5e3e
|
Add loadingComplete callback
|
2018-02-22 18:36:36 -08:00 |
|
Atlante45
|
e5c501a4cd
|
Never delete assets on load
|
2018-02-22 18:36:22 -08:00 |
|
Stephen Birarda
|
a0f7d4dd34
|
use const auto & where possible as per CR comments
|
2018-02-22 18:08:08 -08:00 |
|
Stephen Birarda
|
d69669512f
|
Merge pull request #12483 from Atlante45/feat/backups-integration
Remove deleted file from the _assetsOnDisk set
|
2018-02-22 18:46:25 -07:00 |
|
Atlante45
|
acf04830ee
|
Remove deleted file from the _assetsOnDisk set
|
2018-02-22 17:43:04 -08:00 |
|
Stephen Birarda
|
d9d2b26519
|
delete baked content for unmapped files on AS startup
|
2018-02-22 16:55:35 -08:00 |
|
Stephen Birarda
|
3e4375b1e6
|
set recovery filename during domain content archive recovery
|
2018-02-22 16:54:56 -08:00 |
|
Stephen Birarda
|
1251328d2b
|
reload backup information immediately when restore starts
|
2018-02-22 16:53:49 -08:00 |
|
John Conklin II
|
730dce31e3
|
Merge pull request #12444 from zfox23/commerce_extendedCerts_1
Commerce: Extended Certificate Support, V1
|
2018-02-22 15:19:57 -08:00 |
|
Ryan Huffman
|
c6a806072d
|
Merge pull request #12478 from birarda/feat/content-settings
fix regex for archive name, add general creation error message
|
2018-02-22 15:14:24 -08:00 |
|
Stephen Birarda
|
fc9af39745
|
Merge pull request #12451 from SimonWalton-HiFi/moc-fixes
Add #include of Forward.h to AudioMixer.h
|
2018-02-22 16:09:24 -07:00 |
|
Stephen Birarda
|
7fcac581ae
|
fix regex for archive name, add general error message
|
2018-02-22 15:08:43 -08:00 |
|
Ryan Huffman
|
13b15ced89
|
Merge pull request #12470 from birarda/bug/content-settings-fixes
disable click on restore during a restore or for corrupted
|
2018-02-22 14:41:41 -08:00 |
|
Ryan Huffman
|
12e881a5e3
|
Merge pull request #12471 from birarda/feat/validate-manual-backup-names
refuse to post manual content archive with invalid name
|
2018-02-22 14:29:43 -08:00 |
|
Stephen Birarda
|
7c5ed86e3e
|
refuse to post manual content archive with invalid name
|
2018-02-22 11:41:48 -08:00 |
|
Stephen Birarda
|
3c39c92879
|
Merge pull request #12468 from huffman/fix/reject-invalid-manual-backup-names
Fix/reject invalid manual backup names
|
2018-02-22 12:17:42 -07:00 |
|
Simon Walton
|
a0a12258bf
|
Merge branch 'master' into moc-fixes
|
2018-02-22 11:06:53 -08:00 |
|
Stephen Birarda
|
99c419c315
|
disable click on restore during restore or for corrupted
|
2018-02-22 11:03:31 -08:00 |
|
Zach Fox
|
3d4e6de6ab
|
Quick bugfix
|
2018-02-22 10:49:11 -08:00 |
|
Liv
|
478ec48b63
|
Merge pull request #12463 from misslivirose/fix/edit-bugs
Fix two bugs with Create Menu
|
2018-02-22 09:43:50 -08:00 |
|
Ryan Huffman
|
6dffffbbc0
|
Update clang-format ctor initializer list format
|
2018-02-22 09:30:47 -08:00 |
|
Ryan Huffman
|
017d10de3d
|
Fix DomainContentBackupManager.* headers
|
2018-02-22 09:29:59 -08:00 |
|
Ryan Huffman
|
bf4fd867a3
|
Add rejection for invalid manual backup names
|
2018-02-22 09:29:18 -08:00 |
|
Zach Fox
|
90f05f4db7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
|
2018-02-22 09:23:49 -08:00 |
|
Seth Alves
|
c534e3a6e4
|
Merge pull request #12356 from ctrlaltdavid/21742
Handle tablet entities and overlays not being available
|
2018-02-22 08:48:13 -08:00 |
|
Stephen Birarda
|
07bbb33777
|
Merge pull request #12467 from Atlante45/feat/backups-integration
Ignore baked assets in backups
|
2018-02-21 21:42:18 -07:00 |
|
Atlante45
|
2fb9c324a5
|
Ignore baked assets in backups
|
2018-02-21 18:40:06 -08:00 |
|
Clément Brisset
|
8f7944522f
|
Merge pull request #12465 from birarda/feat/content-settings
fix restore of object settings for content or domain settings
|
2018-02-21 18:15:09 -08:00 |
|
Clément Brisset
|
e83a933f50
|
Merge pull request #12461 from birarda/bug/delete-add-rule
fix badging for changes in tables
|
2018-02-21 18:14:21 -08:00 |
|
Stephen Birarda
|
af3970e211
|
Merge pull request #12466 from Atlante45/feat/backups-integration
Fix crash on manual upload recovery
|
2018-02-21 19:13:56 -07:00 |
|
Clément Brisset
|
bbade00f3d
|
Merge pull request #12434 from birarda/feat/reload-after-restore
check for recovery complete always, reload content page on restore
|
2018-02-21 18:12:37 -08:00 |
|
Stephen Birarda
|
a036de9687
|
fix restore of object settings
|
2018-02-21 18:12:00 -08:00 |
|
Atlante45
|
a2c94bd9d2
|
Fix invalid iterator access
|
2018-02-21 18:08:21 -08:00 |
|
Atlante45
|
e12ca2683f
|
Fix incorrect "all backups loaded" flag
|
2018-02-21 18:08:21 -08:00 |
|
Stephen Birarda
|
e967ed0e22
|
Merge pull request #12459 from Atlante45/feat/backups-integration
Cleanup timers on the correct thread
|
2018-02-21 18:55:39 -07:00 |
|