Merge remote-tracking branch 'origin/master'

# Conflicts: # Content/UI_Assets/WB_in_game_overlay.uasset
gg
2024-01-27 17:52:05 +02:00 · 2024-01-27 17:50:08 +02:00
26 changed files with 57 additions and 27 deletions
--- a/Content/Sounds_And_Songs/Game_Ambiance/hayden-folker-adrift.uasset
+++ b/Content/Sounds_And_Songs/Game_Ambiance/hayden-folker-adrift.uasset
--- a/Content/Sounds_And_Songs/Game_Ambiance/hayden-folker-adrift_Cue.uasset
+++ b/Content/Sounds_And_Songs/Game_Ambiance/hayden-folker-adrift_Cue.uasset
--- a/Content/Sounds_And_Songs/Main_Menu_Theme/alexander-nakarada-untouched-land.uasset
+++ b/Content/Sounds_And_Songs/Main_Menu_Theme/alexander-nakarada-untouched-land.uasset
--- a/Content/Sounds_And_Songs/Main_Menu_Theme/alexander-nakarada-untouched-land_Cue.uasset
+++ b/Content/Sounds_And_Songs/Main_Menu_Theme/alexander-nakarada-untouched-land_Cue.uasset
--- a/Content/Sounds_And_Songs/Main_Menu_Theme/the-loyalist-eastridge-turnstile.uasset
+++ b/Content/Sounds_And_Songs/Main_Menu_Theme/the-loyalist-eastridge-turnstile.uasset
--- a/Content/Sounds_And_Songs/Main_Menu_Theme/the-loyalist-eastridge-turnstile_Cue.uasset
+++ b/Content/Sounds_And_Songs/Main_Menu_Theme/the-loyalist-eastridge-turnstile_Cue.uasset
--- a/Content/Sounds_And_Songs/alexander-nakarada-untouched-land.uasset
+++ b/Content/Sounds_And_Songs/alexander-nakarada-untouched-land.uasset
--- a/Content/Sounds_And_Songs/alexander-nakarada-untouched-land_Cue.uasset
+++ b/Content/Sounds_And_Songs/alexander-nakarada-untouched-land_Cue.uasset
--- a/Content/ThirdPerson/Maps/Level_Menu.umap
+++ b/Content/ThirdPerson/Maps/Level_Menu.umap
--- a/Content/UI_Assets/Kivid_Overlay/gem_overlay.uasset
+++ b/Content/UI_Assets/Kivid_Overlay/gem_overlay.uasset
--- a/Content/UI_Assets/Kivid_Overlay/kollane_gem.uasset
+++ b/Content/UI_Assets/Kivid_Overlay/kollane_gem.uasset
--- a/Content/UI_Assets/Kivid_Overlay/punane_gem.uasset
+++ b/Content/UI_Assets/Kivid_Overlay/punane_gem.uasset
--- a/Content/UI_Assets/Kivid_Overlay/roheline_gem.uasset
+++ b/Content/UI_Assets/Kivid_Overlay/roheline_gem.uasset
--- a/Content/UI_Assets/ProfiiliPildid/image.uasset
+++ b/Content/UI_Assets/ProfiiliPildid/image.uasset
--- a/Content/UI_Assets/ProfiiliPildid/image2.uasset
+++ b/Content/UI_Assets/ProfiiliPildid/image2.uasset
--- a/Content/UI_Assets/ProfiiliPildid/image3.uasset
+++ b/Content/UI_Assets/ProfiiliPildid/image3.uasset
--- a/Content/UI_Assets/ProfiiliPildid/image4.uasset
+++ b/Content/UI_Assets/ProfiiliPildid/image4.uasset
--- a/Content/UI_Assets/WB_Credit.uasset
+++ b/Content/UI_Assets/WB_Credit.uasset
--- a/Content/UI_Assets/WB_MainMenu.uasset
+++ b/Content/UI_Assets/WB_MainMenu.uasset
--- a/Content/UI_Assets/WB_Settings.uasset
+++ b/Content/UI_Assets/WB_Settings.uasset
--- a/Content/UI_Assets/WB_in_game_overlay.uasset
+++ b/Content/UI_Assets/WB_in_game_overlay.uasset
--- a/Content/UI_Assets/image.uasset
+++ b/Content/UI_Assets/image.uasset
--- a/Content/UI_Assets/image2.uasset
+++ b/Content/UI_Assets/image2.uasset
--- a/Content/UI_Assets/image3.uasset
+++ b/Content/UI_Assets/image3.uasset
--- a/Content/UI_Assets/image4.uasset
+++ b/Content/UI_Assets/image4.uasset
--- a/Content/ExternalActors/ThirdPerson/Maps/ThirdPersonMap/D/GQ/B2MCUKQ3SEJLY1GLAYCM6K.uasset
+++ b/Content/ExternalActors/ThirdPerson/Maps/ThirdPersonMap/D/GQ/B2MCUKQ3SEJLY1GLAYCM6K.uasset
Author	SHA1	Message	Date
FatCat2627	8d2ae448fb	Merge remote-tracking branch 'origin/master' # Conflicts: # Content/UI_Assets/WB_in_game_overlay.uasset	2024-01-27 17:52:05 +02:00
FatCat2627	f645893851	gg	2024-01-27 17:50:08 +02:00