Merge branch 'Open-World-Reworked' into dev

# Conflicts:
#	EndlessVendetta/Content/BountySystem/Waypoint/MainBountyIcon.uasset
#	EndlessVendetta/EndlessVendetta.uproject
This commit is contained in:
Rafal Swierczek 2024-02-23 07:09:35 +00:00
commit 8be741b67d
42 changed files with 110 additions and 14 deletions

View File

@ -153,3 +153,6 @@ ManualIPAddress=
AgentMaxStepHeight=73.434059
AgentMaxSlope=64.648003
[/Script/WorldPartitionEditor.WorldPartitionEditorSettings]
CommandletClass=/Script/CoreUObject.Class'/Script/UnrealEd.WorldPartitionConvertCommandlet'

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ab961ac5e159b5505af7c1be1debc8caecbc208e85dec2528452f2f9690d5f1d
size 84616

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:eb831b1e81d188f4f6923a224552142f3d290fda1d8924b3f111ab2eeac82f13
size 91722046

BIN
EndlessVendetta/Content/Levels/OpenWorldTest.umap (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.