AndreyCrusader/ShipPresentation
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into modellers

Browse Source
This commit is contained in:
Andrey
2020-09-29 18:00:24 +05:00
parent c4bad82a37 92d7c51b53
commit 4e9ebdbfdb
13 changed files with 4390 additions and 1188 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ShipPresentation/Config/DefaultEngine.ini
+4
View File
@@ -124,3 +124,7 @@ VisualizeCalibrationColorMaterialPath=None
VisualizeCalibrationCustomMaterialPath=None
VisualizeCalibrationGrayscaleMaterialPath=None
[/Script/EngineSettings.GameMapsSettings]
EditorStartupMap=/Game/maps/NewMap.NewMap
GameDefaultMap=/Game/maps/NewMap.NewMap
ShipPresentation/Content/blueprints/NewBlueprint.uasset
BIN
View File
Binary file not shown.
ShipPresentation/Content/maps/NewMap.umap
BIN
View File
Binary file not shown.
ShipPresentation/Intermediate/CachedAssetRegistry.bin
BIN
View File
Binary file not shown.
ShipPresentation/Intermediate/Config/CoalescedSourceConfigs/Engine.ini
+2 -2
View File
@@ -1,7 +1,7 @@
[/Script/EngineSettings.GameMapsSettings]
GameInstanceClass=/Script/Engine.GameInstance
EditorStartupMap=/Engine/Maps/Templates/Template_Default
GameDefaultMap=/Engine/Maps/Entry
EditorStartupMap=/Game/maps/NewMap.NewMap
GameDefaultMap=/Game/maps/NewMap.NewMap
ServerDefaultMap=/Engine/Maps/Entry
GlobalDefaultGameMode=/Script/Engine.GameModeBase
LocalMapOptions=
ShipPresentation/Saved/AutoScreenshot.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 49 KiB

ShipPresentation/Saved/Config/CrashReportClient/UE4CC-Windows-9C1AC5C847784634272C5ABA101BE70D/CrashReportClient.ini
+5
View File
@@ -0,0 +1,5 @@
[CrashReportClient]
bHideLogFilesOption=false
bIsAllowedToCloseWithoutSending=true
CrashConfigPurgeDays=2
ShipPresentation/Saved/Config/CrashReportClient/UE4CC-Windows-DB76AF664104D73ACAF692889C98DEF9/CrashReportClient.ini
+5
View File
@@ -0,0 +1,5 @@
[CrashReportClient]
bHideLogFilesOption=false
bIsAllowedToCloseWithoutSending=true
CrashConfigPurgeDays=2
ShipPresentation/Saved/Config/Windows/EditorPerProjectUserSettings.ini
+302 -4
View File
File diff suppressed because one or more lines are too long
ShipPresentation/Saved/Config/WorldState/3239346945.json
BIN
View File
Binary file not shown.
ShipPresentation/Saved/Logs/ShipPresentation-backup-2020.09.29-12.30.22.log
+1324
View File
File diff suppressed because it is too large Load Diff
ShipPresentation/Saved/Logs/ShipPresentation-backup-2020.09.29-12.59.00.log
+1466
View File
File diff suppressed because it is too large Load Diff
ShipPresentation/Saved/Logs/ShipPresentation.log
+1282 -1182
View File
File diff suppressed because it is too large Load Diff