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

Merge branch 'modellers' into developer

Browse Source
This commit is contained in:
Andrey
2020-09-29 19:17:34 +05:00
parent 3d4ef7e622 6db161aa71
commit c03d2ced42
33 changed files with 3750 additions and 1284 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ShipPresentation/Config/DefaultEditor.ini
+1
View File
@@ -0,0 +1 @@
ShipPresentation/Content/maps/NewMap.umap
BIN
View File
Binary file not shown.
ShipPresentation/Content/materials/ship/M_BlackRoober.uasset
BIN
View File
Binary file not shown.
ShipPresentation/Content/materials/ship/M_Bronze.uasset
BIN
View File
Binary file not shown.
ShipPresentation/Content/materials/ship/M_Sleeve.uasset
BIN
View File
Binary file not shown.
ShipPresentation/Content/materials/ship/M_Steel.uasset
BIN
View File
Binary file not shown.
ShipPresentation/Content/materials/ship/M_WhiteRoober.uasset
BIN
View File
Binary file not shown.
ShipPresentation/Content/materials/ship/OculusGlass1.uasset
BIN
View File
Binary file not shown.
ShipPresentation/Content/materials/ship/OculusGlass2.uasset
BIN
View File
Binary file not shown.
ShipPresentation/Content/materials/ship/OculusGlass3.uasset
BIN
View File
Binary file not shown.
ShipPresentation/Content/materials/ship/OculusGlass4.uasset
BIN
View File
Binary file not shown.
ShipPresentation/Content/materials/ship/black_paint.uasset
BIN
View File
Binary file not shown.
ShipPresentation/Content/materials/ship/body_paint.uasset
BIN
View File
Binary file not shown.
ShipPresentation/Content/materials/ship/clearglass.uasset
BIN
View File
Binary file not shown.
ShipPresentation/Content/materials/ship/deck.uasset
BIN
View File
Binary file not shown.
ShipPresentation/Content/materials/ship/greenglass.uasset
BIN
View File
Binary file not shown.
ShipPresentation/Content/materials/ship/orange.uasset
BIN
View File
Binary file not shown.
ShipPresentation/Content/materials/ship/red.uasset
BIN
View File
Binary file not shown.
ShipPresentation/Content/materials/ship/redglass.uasset
BIN
View File
Binary file not shown.
ShipPresentation/Content/meshes/ship/SM_Ship_SM_Radar.uasset
BIN
View File
Binary file not shown.
ShipPresentation/Content/meshes/ship/SM_Ship_SM_Ship.uasset
BIN
View File
Binary file not shown.
ShipPresentation/Content/meshes/ship/SM_Ship_SM_TrackerBody.uasset
BIN
View File
Binary file not shown.
ShipPresentation/Content/meshes/ship/SM_Ship_SM_TrackerHead.uasset
BIN
View File
Binary file not shown.
ShipPresentation/Intermediate/AssetRegistryCache/2daf05d2.bin
BIN
View File
Binary file not shown.
ShipPresentation/Intermediate/CachedAssetRegistry.bin
BIN
View File
Binary file not shown.
ShipPresentation/Intermediate/Config/CoalescedSourceConfigs/Editor.ini
+471
View File
File diff suppressed because one or more lines are too long
ShipPresentation/Saved/AutoScreenshot.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 49 KiB

After

Width:  |  Height:  |  Size: 52 KiB

ShipPresentation/Saved/Autosaves/Game/maps/NewMap_Auto1.umap
BIN
View File
Binary file not shown.
ShipPresentation/Saved/Config/CrashReportClient/UE4CC-Windows-17A7007B446DD41C201B64BB5F1F57C9/CrashReportClient.ini
+5
View File
@@ -0,0 +1,5 @@
[CrashReportClient]
bHideLogFilesOption=false
bIsAllowedToCloseWithoutSending=true
CrashConfigPurgeDays=2
ShipPresentation/Saved/Config/Windows/Editor.ini
+3
View File
File diff suppressed because one or more lines are too long
ShipPresentation/Saved/Config/Windows/EditorPerProjectUserSettings.ini
+159 -2
View File
File diff suppressed because one or more lines are too long
ShipPresentation/Saved/Logs/ShipPresentation-backup-2020.09.29-13.01.08.log
+1424
View File
File diff suppressed because it is too large Load Diff
ShipPresentation/Saved/Logs/ShipPresentation.log
+1687 -1282
View File
File diff suppressed because it is too large Load Diff