Merge branch 'Open-World-Reworked' into dev
# Conflicts: # EndlessVendetta/Content/BountySystem/Waypoint/MainBountyIcon.uasset # EndlessVendetta/EndlessVendetta.uproject
This commit is contained in:
commit
8be741b67d
@ -153,3 +153,6 @@ ManualIPAddress=
|
|||||||
AgentMaxStepHeight=73.434059
|
AgentMaxStepHeight=73.434059
|
||||||
AgentMaxSlope=64.648003
|
AgentMaxSlope=64.648003
|
||||||
|
|
||||||
|
[/Script/WorldPartitionEditor.WorldPartitionEditorSettings]
|
||||||
|
CommandletClass=/Script/CoreUObject.Class'/Script/UnrealEd.WorldPartitionConvertCommandlet'
|
||||||
|
|
||||||
|
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Beach/ColorFx.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Beach/ColorFx.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Beach/Fx.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Beach/Fx.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Beach/M_Beach.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Beach/M_Beach.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Beach/Normal_Map.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Beach/Normal_Map.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Beach/Seamless.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Beach/Seamless.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/ColorFx.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/ColorFx.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Combine.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Combine.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Flat/ColorFx.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Flat/ColorFx.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Flat/Fx.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Flat/Fx.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Flat/M_FlatLandscape.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Flat/M_FlatLandscape.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Flat/Normal_Map.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Flat/Normal_Map.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/M_Debug.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/M_Debug.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Mountainous/ColorFx.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Mountainous/ColorFx.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Mountainous/Fx.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Mountainous/Fx.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Mountainous/M_MountainousTerrain.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Mountainous/M_MountainousTerrain.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Mountainous/Normal_Map.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Mountainous/Normal_Map.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Mountainous/Seamless.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Mountainous/Seamless.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Normal_Map.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Normal_Map.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/RockyTerrace/ColorFx.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/RockyTerrace/ColorFx.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/RockyTerrace/Fx.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/RockyTerrace/Fx.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/RockyTerrace/M_RockyTerrace.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/RockyTerrace/M_RockyTerrace.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/RockyTerrace/Normal_Map.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/RockyTerrace/Normal_Map.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Sand/Normal_Map.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Sand/Normal_Map.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Sand/Sand_texture.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Sand/Sand_texture.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Sand/SatMaps.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Sand/SatMaps.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Sand/Shear.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Landscape_Texture/Sand/Shear.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Objects/OpenWorld/BeachfrontArea/Water/M_water.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Objects/OpenWorld/BeachfrontArea/Water/M_water.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Objects/OpenWorld/BeachfrontArea/Water/Water.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Objects/OpenWorld/BeachfrontArea/Water/Water.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence1.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence1.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence2.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence2.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence3.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/BountySystem/ApartmentBounty/CinematicFrmaes/TimothyEliminatedSequence3.uasset
(Stored with Git LFS)
Binary file not shown.
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:ab961ac5e159b5505af7c1be1debc8caecbc208e85dec2528452f2f9690d5f1d
|
||||||
|
size 84616
|
3
EndlessVendetta/Content/Levels/OpenWorldRework.umap
Normal file
3
EndlessVendetta/Content/Levels/OpenWorldRework.umap
Normal 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
BIN
EndlessVendetta/Content/Levels/OpenWorldTest.umap
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/MainMenu/Music/Manu_maybe_3.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/MainMenu/Music/Manu_maybe_3.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/MainMenu/Music/Menu_maybe_1.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/MainMenu/Music/Menu_maybe_1.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/MainMenu/Music/Menu_maybe_2.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/MainMenu/Music/Menu_maybe_2.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/MainMenu/Music/Menu_maybe_3_1.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/MainMenu/Music/Menu_maybe_3_1.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/PauseMenu/PauseMenuBackground.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/PauseMenu/PauseMenuBackground.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/Ships/LZ_HomeHubIcon.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/Ships/LZ_HomeHubIcon.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/Ships/LandingZoneIcon.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/Ships/LandingZoneIcon.uasset
(Stored with Git LFS)
Binary file not shown.
Loading…
Reference in New Issue
Block a user