el/ex2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Super Big Change

Browse Source 
Added a lot of the features on trello, started on making the weapon upgrade station and worked on some smaller importing stuff.
This commit is contained in:
8B0000
2023-05-25 03:59:55 -04:00
parent 8015a135eb
commit c1908bb44c
94 changed files with 37518 additions and 4670 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Content/Drill/DrillActor_BP.uasset Normal file
View File

Binary file not shown.

BIN
Content/FirstPersonBP/Blueprints/AI.uasset Normal file
View File

Binary file not shown.

BIN
Content/FirstPersonBP/Blueprints/FirstPersonCharacter.uasset
View File

Binary file not shown.

BIN
Content/FirstPersonBP/Blueprints/UpgradeBench.uasset Normal file
View File

Binary file not shown.

BIN
Content/FirstPersonBP/Maps/TestingMap.umap
View File

Binary file not shown.

BIN
Content/FirstPersonBP/Maps/TestingMap_BuiltData.uasset
View File

Binary file not shown.

BIN
Content/Geometry/Meshes/Material.uasset Normal file
View File

Binary file not shown.

20
Content/Geometry/Meshes/emp.mtl Normal file
View File

@@ -0,0 +1,20 @@
# Blender MTL File: 'emp.blend'
# Material Count: 2
newmtl Material
Ns 323.999994
Ka 1.000000 1.000000 1.000000
Kd 0.800000 0.800000 0.800000
Ks 0.500000 0.500000 0.500000
Ke 0.000000 0.000000 0.000000
Ni 1.450000
d 1.000000
illum 2
newmtl None
Ns 500
Ka 0.8 0.8 0.8
Kd 0.8 0.8 0.8
Ks 0.8 0.8 0.8
d 1
illum 2

7803
Content/Geometry/Meshes/emp.obj Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
Content/Geometry/Meshes/emp.uasset Normal file
View File

Binary file not shown.

20
Content/Geometry/Meshes/shippingcontainer.mtl Normal file
View File

@@ -0,0 +1,20 @@
# Blender MTL File: 'shippingcontainer.blend'
# Material Count: 2
newmtl Material
Ns 323.999994
Ka 1.000000 1.000000 1.000000
Kd 0.800000 0.800000 0.800000
Ks 0.500000 0.500000 0.500000
Ke 0.000000 0.000000 0.000000
Ni 1.450000
d 1.000000
illum 2
newmtl None
Ns 500
Ka 0.8 0.8 0.8
Kd 0.8 0.8 0.8
Ks 0.8 0.8 0.8
d 1
illum 2

7441
Content/Geometry/Meshes/shippingcontainer.obj Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
Content/Geometry/Meshes/shippingcontainer.uasset Normal file
View File

Binary file not shown.

BIN
Content/Textures/ex2Proto.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
Content/Textures/ex2Proto.uasset Normal file
View File

Binary file not shown.

BIN
Content/Textures/ex2ProtoDRedMat1.uasset Normal file
View File

Binary file not shown.

BIN
Content/Textures/ex2ProtoMat.uasset Normal file
View File

Binary file not shown.

BIN
Content/Textures/ex2ProtoOrange.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
Content/Textures/ex2ProtoOrange.uasset Normal file
View File

Binary file not shown.

BIN
Content/Textures/ex2ProtoOrangeMat.uasset Normal file
View File

Binary file not shown.

BIN
Content/Textures/ex2ProtoRed.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
Content/Textures/ex2ProtoRed.uasset Normal file
View File

Binary file not shown.

BIN
Content/Weapons/Attachments/attachments_BP/aRDS_BP.uasset
View File

Binary file not shown.

BIN
Content/Weapons/Attachments/attachments_BP/aSightRDS_BP.uasset
View File

Binary file not shown.

BIN
Content/Weapons/Attachments/attachments_Mesh/Material.uasset
View File

Binary file not shown.

BIN
Content/Weapons/Attachments/attachments_Mesh/RDS1.uasset
View File

Binary file not shown.

BIN
Content/Weapons/Attachments/attachments_Mesh/RedDot.uasset
View File

Binary file not shown.

BIN
Content/Weapons/Attachments/attachments_Mesh/rds.uasset
View File

Binary file not shown.

BIN
Content/Weapons/Attachments/attachments_Mesh/rds2.uasset
View File

Binary file not shown.

BIN
Content/Weapons/Attachments/attachments_Tex/rds.uasset
View File

Binary file not shown.

BIN
Content/Weapons/Attachments/attachments_Tex/rdsSmall.uasset
View File

Binary file not shown.

BIN
Content/Weapons/Attachments/attachments_Tex/rds_128x128.uasset
View File

Binary file not shown.

BIN
Content/Weapons/UpgradeBench/UpgradeBench_BP.uasset Normal file
View File

Binary file not shown.

BIN
Intermediate/AssetRegistryCache/4d6282ec.bin Normal file
View File

Binary file not shown.

BIN
Intermediate/CachedAssetRegistry.bin
View File

Binary file not shown.

BIN
Intermediate/ReimportCache/3688439234.bin
View File

Binary file not shown.

BIN
Saved/AutoScreenshot.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 40 KiB

BIN
Saved/Autosaves/Game/FirstPersonBP/Blueprints/AI_Auto1.uasset Normal file
View File

Binary file not shown.

BIN
Saved/Autosaves/Game/FirstPersonBP/Maps/TestingMap_Auto0.umap Normal file
View File

Binary file not shown.

BIN
Saved/Autosaves/Game/FirstPersonBP/Maps/TestingMap_Auto1.umap Normal file
View File

Binary file not shown.

BIN
Saved/Autosaves/Game/FirstPersonBP/Maps/TestingMap_Auto2.umap
View File

Binary file not shown.

BIN
Saved/Autosaves/Game/FirstPersonBP/Maps/TestingMap_Auto3.umap Normal file
View File

Binary file not shown.

BIN
Saved/Autosaves/Game/FirstPersonBP/Maps/TestingMap_Auto4.umap
View File

Binary file not shown.

BIN
Saved/Autosaves/Game/FirstPersonBP/Maps/TestingMap_Auto5.umap
View File

Binary file not shown.

BIN
Saved/Autosaves/Game/FirstPersonBP/Maps/TestingMap_Auto6.umap Normal file
View File

Binary file not shown.

BIN
Saved/Autosaves/Game/FirstPersonBP/Maps/TestingMap_Auto7.umap Normal file
View File

Binary file not shown.

BIN
Saved/Autosaves/Game/FirstPersonBP/Maps/TestingMap_Auto8.umap Normal file
View File

Binary file not shown.

BIN
Saved/Autosaves/Game/FirstPersonBP/Maps/TestingMap_Auto9.umap Normal file
View File

Binary file not shown.

BIN
Saved/Autosaves/Game/Textures/ex2Proto_Auto2.uasset Normal file
View File

Binary file not shown.

BIN
Saved/Autosaves/Game/Textures/ex2Proto_Auto4.uasset Normal file
View File

Binary file not shown.

BIN
Saved/Autosaves/PackageRestoreData.json
View File

Binary file not shown.

0
Saved/Config/CrashReportClient/UE4CC-Windows-7A384FD54ED7E1639AC5C0AD976256D4/CrashReportClient.ini → Saved/Config/CrashReportClient/UE4CC-Windows-0383092E4E580E5B0327D4876FF3FCD4/CrashReportClient.ini
View File

0
Saved/Config/CrashReportClient/UE4CC-Windows-9798337C41C03DF294AB51932CCBC5F7/CrashReportClient.ini → Saved/Config/CrashReportClient/UE4CC-Windows-1B64875C4F98C9CE89E683B87883F25D/CrashReportClient.ini
View File

5
Saved/Config/CrashReportClient/UE4CC-Windows-267FD04049847B0F916177917B812208/CrashReportClient.ini Normal file
View File

@@ -0,0 +1,5 @@
[CrashReportClient]
bHideLogFilesOption=false
bIsAllowedToCloseWithoutSending=true
CrashConfigPurgeDays=2

5
Saved/Config/CrashReportClient/UE4CC-Windows-2B2BB0904A747F61FC49C9A2FA1BCD23/CrashReportClient.ini Normal file
View File

@@ -0,0 +1,5 @@
[CrashReportClient]
bHideLogFilesOption=false
bIsAllowedToCloseWithoutSending=true
CrashConfigPurgeDays=2

5
Saved/Config/CrashReportClient/UE4CC-Windows-2E9D67D84D43FA62314E95BBBB455B58/CrashReportClient.ini Normal file
View File

@@ -0,0 +1,5 @@
[CrashReportClient]
bHideLogFilesOption=false
bIsAllowedToCloseWithoutSending=true
CrashConfigPurgeDays=2

5
Saved/Config/CrashReportClient/UE4CC-Windows-2F82D72E45F06D13033BC3B5D7623541/CrashReportClient.ini Normal file
View File

@@ -0,0 +1,5 @@
[CrashReportClient]
bHideLogFilesOption=false
bIsAllowedToCloseWithoutSending=true
CrashConfigPurgeDays=2

5
Saved/Config/CrashReportClient/UE4CC-Windows-322EFEAE400667CD7AE3AA9C9F05886A/CrashReportClient.ini Normal file
View File

@@ -0,0 +1,5 @@
[CrashReportClient]
bHideLogFilesOption=false
bIsAllowedToCloseWithoutSending=true
CrashConfigPurgeDays=2

5
Saved/Config/CrashReportClient/UE4CC-Windows-32448B2745CE8B20FAA319AF476D71B1/CrashReportClient.ini Normal file
View File

@@ -0,0 +1,5 @@
[CrashReportClient]
bHideLogFilesOption=false
bIsAllowedToCloseWithoutSending=true
CrashConfigPurgeDays=2

5
Saved/Config/CrashReportClient/UE4CC-Windows-3B88A3714ECA2E2EF5C860AEC07B7B74/CrashReportClient.ini Normal file
View File

@@ -0,0 +1,5 @@
[CrashReportClient]
bHideLogFilesOption=false
bIsAllowedToCloseWithoutSending=true
CrashConfigPurgeDays=2

5
Saved/Config/CrashReportClient/UE4CC-Windows-3DEF2BA6421ED5A979126EB8D13657EB/CrashReportClient.ini Normal file
View File

@@ -0,0 +1,5 @@
[CrashReportClient]
bHideLogFilesOption=false
bIsAllowedToCloseWithoutSending=true
CrashConfigPurgeDays=2

5
Saved/Config/CrashReportClient/UE4CC-Windows-5C9450814236DCA7A3A26C82B453D729/CrashReportClient.ini Normal file
View File

@@ -0,0 +1,5 @@
[CrashReportClient]
bHideLogFilesOption=false
bIsAllowedToCloseWithoutSending=true
CrashConfigPurgeDays=2

5
Saved/Config/CrashReportClient/UE4CC-Windows-7C6289DA4A16ACD9662F488F1C8DF38D/CrashReportClient.ini Normal file
View File

@@ -0,0 +1,5 @@
[CrashReportClient]
bHideLogFilesOption=false
bIsAllowedToCloseWithoutSending=true
CrashConfigPurgeDays=2

5
Saved/Config/CrashReportClient/UE4CC-Windows-8B426DEB4AE1A481D2ECE8887FD00523/CrashReportClient.ini Normal file
View File

@@ -0,0 +1,5 @@
[CrashReportClient]
bHideLogFilesOption=false
bIsAllowedToCloseWithoutSending=true
CrashConfigPurgeDays=2

5
Saved/Config/CrashReportClient/UE4CC-Windows-AA6CA31748A860F6C5866B8B54E1A578/CrashReportClient.ini Normal file
View File

@@ -0,0 +1,5 @@
[CrashReportClient]
bHideLogFilesOption=false
bIsAllowedToCloseWithoutSending=true
CrashConfigPurgeDays=2

5
Saved/Config/CrashReportClient/UE4CC-Windows-B6907FF341C9B1B46AF939960B3E21C4/CrashReportClient.ini Normal file
View File

@@ -0,0 +1,5 @@
[CrashReportClient]
bHideLogFilesOption=false
bIsAllowedToCloseWithoutSending=true
CrashConfigPurgeDays=2

5
Saved/Config/CrashReportClient/UE4CC-Windows-BA012BD546B9EB416AE84BB5A0C65187/CrashReportClient.ini Normal file
View File

@@ -0,0 +1,5 @@
[CrashReportClient]
bHideLogFilesOption=false
bIsAllowedToCloseWithoutSending=true
CrashConfigPurgeDays=2

5
Saved/Config/CrashReportClient/UE4CC-Windows-C31303E44B71392DBDBECDB96CFC7185/CrashReportClient.ini Normal file
View File

@@ -0,0 +1,5 @@
[CrashReportClient]
bHideLogFilesOption=false
bIsAllowedToCloseWithoutSending=true
CrashConfigPurgeDays=2

5
Saved/Config/CrashReportClient/UE4CC-Windows-CB19F7D742B3850C113165A1BC228670/CrashReportClient.ini Normal file
View File

@@ -0,0 +1,5 @@
[CrashReportClient]
bHideLogFilesOption=false
bIsAllowedToCloseWithoutSending=true
CrashConfigPurgeDays=2

5
Saved/Config/CrashReportClient/UE4CC-Windows-D8F966E741ACA7A3C65593B3975A525B/CrashReportClient.ini Normal file
View File

@@ -0,0 +1,5 @@
[CrashReportClient]
bHideLogFilesOption=false
bIsAllowedToCloseWithoutSending=true
CrashConfigPurgeDays=2

2
Saved/Config/Windows/Editor.ini
View File

File diff suppressed because one or more lines are too long

243
Saved/Config/Windows/EditorPerProjectUserSettings.ini
View File

File diff suppressed because one or more lines are too long

8
Saved/Config/Windows/Engine.ini
View File

@@ -56,11 +56,3 @@ MLSDKPath=(Path="")
[/Script/UnrealEd.EditorEngine] [/Script/UnrealEd.EditorEngine]
FlipNormalMapGreenChannel=False FlipNormalMapGreenChannel=False
[WindowsApplication.Accessibility]
StickyKeysHotkey=True
ToggleKeysHotkey=True
FilterKeysHotkey=True
StickyKeysConfirmation=True
ToggleKeysConfirmation=True
FilterKeysConfirmation=True

BIN
Saved/Config/WorldState/4046359863.json
View File

Binary file not shown.

1537
Saved/Logs/Ex2-backup-2023.05.23-17.36.49.log Normal file
View File

File diff suppressed because one or more lines are too long

6176
Saved/Logs/Ex2.log
View File

File diff suppressed because one or more lines are too long

1003
Saved/Logs/Ex2_2-backup-2022.06.14-02.36.53.log Normal file
View File

File diff suppressed because one or more lines are too long

1016
Saved/Logs/Ex2_2-backup-2023.05.25-07.11.18.log Normal file
View File

File diff suppressed because one or more lines are too long

1013
Saved/Logs/Ex2_2-backup-2023.05.25-07.12.06.log Normal file
View File

File diff suppressed because one or more lines are too long

1017
Saved/Logs/Ex2_2-backup-2023.05.25-07.18.33.log Normal file
View File

File diff suppressed because one or more lines are too long

1018
Saved/Logs/Ex2_2-backup-2023.05.25-07.22.15.log Normal file
View File

File diff suppressed because one or more lines are too long

1013
Saved/Logs/Ex2_2-backup-2023.05.25-07.23.40.log Normal file
View File

File diff suppressed because one or more lines are too long

1020
Saved/Logs/Ex2_2-backup-2023.05.25-07.24.34.log Normal file
View File

File diff suppressed because one or more lines are too long

1020
Saved/Logs/Ex2_2-backup-2023.05.25-07.25.56.log Normal file
View File

File diff suppressed because one or more lines are too long

1016
Saved/Logs/Ex2_2-backup-2023.05.25-07.26.38.log Normal file
View File

File diff suppressed because one or more lines are too long

1016
Saved/Logs/Ex2_2-backup-2023.05.25-07.28.29.log Normal file
View File

File diff suppressed because one or more lines are too long

1014
Saved/Logs/Ex2_2-backup-2023.05.25-07.32.49.log Normal file
View File

File diff suppressed because one or more lines are too long

1014
Saved/Logs/Ex2_2-backup-2023.05.25-07.35.01.log Normal file
View File

File diff suppressed because one or more lines are too long

1015
Saved/Logs/Ex2_2-backup-2023.05.25-07.36.12.log Normal file
View File

File diff suppressed because one or more lines are too long

1017
Saved/Logs/Ex2_2-backup-2023.05.25-07.38.15.log Normal file
View File

File diff suppressed because one or more lines are too long

1016
Saved/Logs/Ex2_2-backup-2023.05.25-07.39.59.log Normal file
View File

File diff suppressed because one or more lines are too long

1019
Saved/Logs/Ex2_2-backup-2023.05.25-07.40.43.log Normal file
View File

File diff suppressed because one or more lines are too long

1019
Saved/Logs/Ex2_2-backup-2023.05.25-07.41.24.log Normal file
View File

File diff suppressed because one or more lines are too long

1587
Saved/Logs/Ex2_2.log
View File

File diff suppressed because one or more lines are too long