Merge remote-tracking branch 'origin/Green-Light/Rafals-Branch' into AI

# Conflicts: # EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
2024-02-29 13:03:34 +00:00 · 2024-02-29 13:03:34 +00:00 · 45d86209be
commit 45d86209be
parent 16752fb2ce cf62d48c55
11749 changed files with 35207 additions and 74 deletions
--- a/EndlessVendetta/Config/DefaultEngine.ini
+++ b/EndlessVendetta/Config/DefaultEngine.ini
@ -60,7 +60,7 @@
 +CollisionChannelRedirects=(OldName="PawnMovement",NewName="Pawn")

 [/Script/EngineSettings.GameMapsSettings]
-EditorStartupMap=/Game/Levels/AITest.AITest
+EditorStartupMap=/Game/Levels/OpenWorldRework.OpenWorldRework
 LocalMapOptions=
 TransitionMap=None
 bUseSplitscreen=True
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/Canyon_road/ColorFx.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/Canyon_road/ColorFx.uasset
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/Canyon_road/ColorFx001.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/Canyon_road/ColorFx001.uasset
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/Canyon_road/Fx.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/Canyon_road/Fx.uasset
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/Canyon_road/M_CanyonRoad.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/Canyon_road/M_CanyonRoad.uasset
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/Canyon_road/Normal_Map.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/Canyon_road/Normal_Map.uasset
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/Canyon_road/Occlusion.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/Canyon_road/Occlusion.uasset
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/Flat/ColorFx.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/Flat/ColorFx.uasset
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/Flat/Fx.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/Flat/Fx.uasset
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/Flat/M_FlatLandscape.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/Flat/M_FlatLandscape.uasset
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/Flat/Normal_Map.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/Flat/Normal_Map.uasset
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/HIll/ColorFx.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/HIll/ColorFx.uasset
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/HIll/Fx.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/HIll/Fx.uasset
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/HIll/M_Hill.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/HIll/M_Hill.uasset
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/HIll/Normal_Map.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/HIll/Normal_Map.uasset
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/HIll/Occlusion.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/HIll/Occlusion.uasset
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/Mountainous/ColorFx.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/Mountainous/ColorFx.uasset
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/Mountainous/M_MountainousTerrain.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/Mountainous/M_MountainousTerrain.uasset
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/Mountainous/Occlusion.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/Mountainous/Occlusion.uasset
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/Practice_landscape/ColorFx.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/Practice_landscape/ColorFx.uasset
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/Practice_landscape/M_Practice.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/Practice_landscape/M_Practice.uasset
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/Practice_landscape/Normal_Map.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/Practice_landscape/Normal_Map.uasset
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/RockyTerrace/M_RockyTerrace.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/RockyTerrace/M_RockyTerrace.uasset
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/Sideare_Hill/ColorFx.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/Sideare_Hill/ColorFx.uasset
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/Sideare_Hill/Fx.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/Sideare_Hill/Fx.uasset
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/Sideare_Hill/M_SideHIll.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/Sideare_Hill/M_SideHIll.uasset
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/Sideare_Hill/Normal_Map.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/Sideare_Hill/Normal_Map.uasset
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/Sideare_Hill/Occlusion.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/Sideare_Hill/Occlusion.uasset
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/Underwater/ColorFx.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/Underwater/ColorFx.uasset
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/Underwater/Fx.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/Underwater/Fx.uasset
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/Underwater/M_Underwater.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/Underwater/M_Underwater.uasset
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/Underwater/Normal_Map.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/Underwater/Normal_Map.uasset
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/Underwater/Occlusion.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/Underwater/Occlusion.uasset
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/Underwater_canyon/ColorFx.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/Underwater_canyon/ColorFx.uasset
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/Underwater_canyon/ColorFx_Mat.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/Underwater_canyon/ColorFx_Mat.uasset
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/Underwater_canyon/Fx.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/Underwater_canyon/Fx.uasset
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/Underwater_canyon/NewMaterial.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/Underwater_canyon/NewMaterial.uasset
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/Underwater_canyon/Normal_Map.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/Underwater_canyon/Normal_Map.uasset
--- a/EndlessVendetta/Content/Assets/Landscape_Texture/Underwater_canyon/Occlusion.uasset
+++ b/EndlessVendetta/Content/Assets/Landscape_Texture/Underwater_canyon/Occlusion.uasset
--- a/EndlessVendetta/Content/Assets/Objects/OpenWorld/BeachfrontArea/Water/M_water.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/OpenWorld/BeachfrontArea/Water/M_water.uasset
--- a/EndlessVendetta/Content/Assets/Objects/OpenWorld/Landscape_Road/Asphalt024A_1K-PNG_AmbientOcclusion.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/OpenWorld/Landscape_Road/Asphalt024A_1K-PNG_AmbientOcclusion.uasset
--- a/EndlessVendetta/Content/Assets/Objects/OpenWorld/Landscape_Road/Asphalt024A_1K-PNG_Displacement.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/OpenWorld/Landscape_Road/Asphalt024A_1K-PNG_Displacement.uasset
--- a/EndlessVendetta/Content/Assets/Objects/OpenWorld/Landscape_Road/Asphalt024A_1K-PNG_NormalDX.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/OpenWorld/Landscape_Road/Asphalt024A_1K-PNG_NormalDX.uasset
--- a/EndlessVendetta/Content/Assets/Objects/OpenWorld/Landscape_Road/Asphalt024A_1K-PNG_NormalGL.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/OpenWorld/Landscape_Road/Asphalt024A_1K-PNG_NormalGL.uasset
--- a/EndlessVendetta/Content/Assets/Objects/OpenWorld/Landscape_Road/Asphalt024A_1K-PNG_Roughness.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/OpenWorld/Landscape_Road/Asphalt024A_1K-PNG_Roughness.uasset
--- a/EndlessVendetta/Content/Assets/Objects/OpenWorld/Landscape_Road/Newroad1.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/OpenWorld/Landscape_Road/Newroad1.uasset
--- a/EndlessVendetta/Content/Assets/Objects/OpenWorld/Landscape_Road/Newroad_ncl1_1.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/OpenWorld/Landscape_Road/Newroad_ncl1_1.uasset
--- a/EndlessVendetta/Content/Assets/Objects/OpenWorld/Landscape_Road/newRoad.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/OpenWorld/Landscape_Road/newRoad.uasset
--- a/EndlessVendetta/Content/Assets/Objects/OpenWorld/Landscape_Road/newRoad_justline.uasset
+++ b/EndlessVendetta/Content/Assets/Objects/OpenWorld/Landscape_Road/newRoad_justline.uasset
--- a/EndlessVendetta/Content/Audio/Music/Combat_track_1/Combat_start__808s_.uasset
+++ b/EndlessVendetta/Content/Audio/Music/Combat_track_1/Combat_start__808s_.uasset
--- a/EndlessVendetta/Content/Audio/Music/Combat_track_1/Drums.uasset
+++ b/EndlessVendetta/Content/Audio/Music/Combat_track_1/Drums.uasset
--- a/EndlessVendetta/Content/Audio/Music/Combat_track_1/Guitar.uasset
+++ b/EndlessVendetta/Content/Audio/Music/Combat_track_1/Guitar.uasset
--- a/EndlessVendetta/Content/Audio/Music/Combat_track_1/Hats_and_clap.uasset
+++ b/EndlessVendetta/Content/Audio/Music/Combat_track_1/Hats_and_clap.uasset
--- a/EndlessVendetta/Content/Audio/Music/Combat_track_1/Sound_effect.uasset
+++ b/EndlessVendetta/Content/Audio/Music/Combat_track_1/Sound_effect.uasset
--- a/EndlessVendetta/Content/Audio/Music/Combat_track_1/combat_Continuous.uasset
+++ b/EndlessVendetta/Content/Audio/Music/Combat_track_1/combat_Continuous.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/Becca_AI/Becca_Cover_me.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/Becca_AI/Becca_Cover_me.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/Becca_AI/Becca_Firing.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/Becca_AI/Becca_Firing.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/Becca_AI/Becca_Im_hit.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/Becca_AI/Becca_Im_hit.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/Becca_AI/Becca_Im_taking_cover.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/Becca_AI/Becca_Im_taking_cover.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/Becca_AI/Becca_Reloading.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/Becca_AI/Becca_Reloading.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/Becca_AI/Becca_Theyre_hit.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/Becca_AI/Becca_Theyre_hit.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/Becca_AI/Becca_Theyre_over_there.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/Becca_AI/Becca_Theyre_over_there.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/Becca_AI/Becca_Where_did_they_go.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/Becca_AI/Becca_Where_did_they_go.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/Becca_AI/becca_I_hear_them_theyre_there.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/Becca_AI/becca_I_hear_them_theyre_there.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/James_AI/James_Cover_me.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/James_AI/James_Cover_me.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/James_AI/James_Firing.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/James_AI/James_Firing.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/James_AI/James_Hit.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/James_AI/James_Hit.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/James_AI/James_I_hear_them_theyre_over_there.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/James_AI/James_I_hear_them_theyre_over_there.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/James_AI/James_Taking_cover.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/James_AI/James_Taking_cover.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/James_AI/James_Theyre_over_there.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/James_AI/James_Theyre_over_there.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/James_AI/James_Where_did_they_go.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/James_AI/James_Where_did_they_go.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/James_AI/James_reloading.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/James_AI/James_reloading.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/James_AI/James_theyre_hit.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/James_AI/James_theyre_hit.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/Kacper_AI/Kacper_Cover_me.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/Kacper_AI/Kacper_Cover_me.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/Kacper_AI/Kacper_I_hear_them_theyre_here.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/Kacper_AI/Kacper_I_hear_them_theyre_here.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/Kacper_AI/Kacper_Im_firing.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/Kacper_AI/Kacper_Im_firing.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/Kacper_AI/Kacper_Theyre_hit.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/Kacper_AI/Kacper_Theyre_hit.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/Kacper_AI/Kacper_Theyre_over_here.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/Kacper_AI/Kacper_Theyre_over_here.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/Kacper_AI/Kacper_finding_cover.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/Kacper_AI/Kacper_finding_cover.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/Kacper_AI/Kacper_hit.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/Kacper_AI/Kacper_hit.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/Kacper_AI/Kacper_reloading.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/Kacper_AI/Kacper_reloading.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/Kacper_AI/Kacper_where_did_they_go.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/Kacper_AI/Kacper_where_did_they_go.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/Leo_AI/LEo_Reloading.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/Leo_AI/LEo_Reloading.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/Leo_AI/Leo_Im_firing.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/Leo_AI/Leo_Im_firing.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/Leo_AI/Leo_cover_me.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/Leo_AI/Leo_cover_me.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/Leo_AI/Leo_hit.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/Leo_AI/Leo_hit.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/Leo_AI/Leo_taking_cover.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/Leo_AI/Leo_taking_cover.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/Leo_AI/Leo_theyre_here_i_heard_them.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/Leo_AI/Leo_theyre_here_i_heard_them.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/Leo_AI/Leo_theyre_hit.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/Leo_AI/Leo_theyre_hit.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/Leo_AI/Leo_theyre_hit_2.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/Leo_AI/Leo_theyre_hit_2.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/Leo_AI/Leo_theyre_hit_2_1.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/Leo_AI/Leo_theyre_hit_2_1.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/Leo_AI/Leo_theyre_over_there.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/Leo_AI/Leo_theyre_over_there.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/Leo_AI/Leo_where_did_they_go.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/Leo_AI/Leo_where_did_they_go.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/Maddie_AI/Maddie_Im_firing.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/Maddie_AI/Maddie_Im_firing.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/Maddie_AI/Maddie_Reloading.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/Maddie_AI/Maddie_Reloading.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/Maddie_AI/Maddie_Theyre_hit.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/Maddie_AI/Maddie_Theyre_hit.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/Maddie_AI/Maddie_Theyre_over_here.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/Maddie_AI/Maddie_Theyre_over_here.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/Maddie_AI/Maddie_cover_me.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/Maddie_AI/Maddie_cover_me.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/Maddie_AI/Maddie_hit.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/Maddie_AI/Maddie_hit.uasset
--- a/EndlessVendetta/Content/Audio/VoiceLines/Maddie_AI/Maddie_where_did_they_go.uasset
+++ b/EndlessVendetta/Content/Audio/VoiceLines/Maddie_AI/Maddie_where_did_they_go.uasset
--- a/Show More
+++ b/Show More