Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-17 01:57:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
64841 commits 76 branches 59 tags 1.2 GiB
Commit graph

64841 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
697f0c443c Fix warning 2018-02-15 17:43:02 -08:00
SamGondelman
2d0b85af72 workaround bug 2018-02-15 17:28:59 -08:00
Atlante45
2b85634a21 Fix build error 2018-02-15 17:03:55 -08:00
Atlante45
cae3e0a9dc Add status func to ContentSettingsBackupHandler 2018-02-15 17:00:24 -08:00
Atlante45
771e4cd9f4 Hook up status and progress 2018-02-15 16:48:21 -08:00
Atlante45
57410e4f1c Remove ES restart after restore 2018-02-15 16:48:21 -08:00
Atlante45
b76e1b9750 Add backup status getters 2018-02-15 16:48:21 -08:00
Atlante45
a7ca539899 Simplify BackupHandler pattern 2018-02-15 16:48:21 -08:00
Ryan Huffman
1120b12b8c Fix argument to isAvailable 2018-02-15 16:47:48 -08:00
Ryan Huffman
2942a53a1d Add recovery mode and full backup information to DS 2018-02-15 16:47:48 -08:00
Ryan Huffman
dd0b8a0c2f Add backup download API to DS 2018-02-15 16:47:23 -08:00
Ryan Huffman
9e99c5c744 Add restart of ES during backup recovery 2018-02-15 16:47:23 -08:00
Clément Brisset
f67931c936
Merge pull request #12420 from birarda/feat/content-settings-backup-handler 
Add a content settings backup handler
 2018-02-15 16:46:22 -08:00
Zach Fox
c4e9c76258 Small UIT tweaks 2018-02-15 16:03:49 -08:00
Stephen Birarda
e71f2fa387 use QtHelpers macro for blocking invoke 2018-02-15 16:03:03 -08:00
Stephen Birarda
e06c95f586 make settings manager methods used for backup/restore thread safe 2018-02-15 15:55:13 -08:00
Liv Erickson
175532c444 show outline for zones when rotating 2018-02-15 15:51:54 -08:00
Sam Gateau
f809862870
Merge pull request #12412 from samcake/blue 
Introduce task abort feature for early exit of task branch
 2018-02-15 15:50:43 -08:00
SamGondelman
b189433855 merge 2018-02-15 15:50:36 -08:00
SamGondelman
2d754edf74 CR 2018-02-15 15:48:41 -08:00
Dante Ruiz
a194c8bc03 Merge branch 'master' of github.com:highfidelity/hifi into fix-qml-tablet-apps 2018-02-15 15:46:16 -08:00
Stephen Birarda
f5cad5683d make sure backup handlers end up on the correct thread 2018-02-15 15:39:25 -08:00
Stephen Birarda
f624e1b464 add a content settings backup handler 2018-02-15 15:10:51 -08:00
Dante Ruiz
bbcf865db3 Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-avatar-entities 2018-02-15 15:03:12 -08:00
Dante Ruiz
e4db09fef8 don't update avatar entities if the avatars ID is AVATAR_SELF_ID 2018-02-15 15:02:45 -08:00
Zach Fox
811ecf9db8 Fix 2018-02-15 14:44:33 -08:00
Stephen Birarda
e0e04b8bb2
Merge pull request #12413 from Atlante45/feat/backups-integration 
Asset Server deplays queries until fully setup
 2018-02-15 15:40:56 -07:00
Atlante45
3297e39c14 CR 2018-02-15 13:39:18 -08:00
Zach Fox
8072372822 Lots of changes 2018-02-15 13:27:13 -08:00
samcake
c70b655fbc A bit more explanations to the Task Flow class 2018-02-15 11:55:16 -08:00
Anthony J. Thibault
f07b1fa4c5 Revert "FBX node IDs aren't alphanumerically ordered per logical structure" 
This reverts commit a7ec4501e6.

Because remainingModels is a QSet, the order is not guaranteed.
Therefore the same code iterating over the same items will sometimes have a different ordering.
See docs for QSet, http://doc.qt.io/qt-5/qset.html
This was bug was causing scrambled avatars, because both the transmitter and receiver of the AvatarData packets
make the strong assumption that the joint orders are same.  When they are not the avatar's appear scrambled.
 2018-02-15 11:32:29 -08:00
Atlante45
d6e2814081 Write assets to disk when recovering full backup 2018-02-15 11:28:52 -08:00
Atlante45
9fca92facd Move EntitiesBackupHandler to its own file 2018-02-15 11:28:52 -08:00
Atlante45
d8d05fe045 Rename backup supervisor 2018-02-15 11:27:21 -08:00
Atlante45
4482f9c83c Queue all requests until the AS is fully setup 2018-02-15 11:27:21 -08:00
Atlante45
ce93b9a1f4 Simplify BackupHandler pattern 2018-02-15 11:27:20 -08:00
samcake
0228392ac9 Merge branch 'blue' of https://github.com/samcake/hifi into blue 2018-02-15 11:24:49 -08:00
Zach Fox
b8fb08dc74 Avatar support 2018-02-15 11:24:22 -08:00
samcake
b21b98c810 Add a way to early abort a task from a Job, apply that to the highlight effect to shave unecessary work 2018-02-15 11:24:20 -08:00
Stephen Birarda
84761c003d
Merge pull request #12410 from huffman/feat/ds-backup-apis 
DS backup cleanup
 2018-02-15 12:21:56 -07:00
Zach Fox
3c620282b1
Merge pull request #12393 from zfox23/fixAvailabilityMouseArea 
PAL: Prevent opening of Availability from WebView
 2018-02-15 11:10:05 -08:00
Ryan Huffman
efb2473fcf Updaet createManualBackup to defer response until creation is done 2018-02-15 11:02:55 -08:00
Sam Gondelman
36a74eaeee
Merge branch 'master' into decals 2018-02-15 11:02:49 -08:00
Ryan Huffman
df809f5a3e Cleanup logging for backup cleanup 2018-02-15 11:02:29 -08:00
Ryan Huffman
4b2e907ada Update entities recover backup to reset id and version 2018-02-15 11:02:14 -08:00
Brad Hefta-Gaub
e367af6cd8
Merge pull request #12385 from birarda/bug/cve-update-marked 
updates to electron-packager and node-notifier for CVEs
 2018-02-15 10:49:25 -08:00
Alexander Ivash
beb595266d fix 4x 'fromQml' slots execution 
note: per discussion with Austion & Seth, TabletRoot should be the only entity sending 'sendToScript' signals to C++
 2018-02-15 21:45:35 +03:00
Stephen Birarda
c56c249a4b
Merge pull request #12406 from huffman/feat/ds-backup-apis 
Backup APIs
 2018-02-15 11:34:59 -07:00
Ryan Huffman
1aba89b908 Fix style of init list 2018-02-15 10:22:35 -08:00
Ryan Huffman
145a8b385b Move HTTP_RESPONSE_CHUNK_SIZE into lambda for http response 2018-02-15 10:22:35 -08:00