Merge branch 'Main-Bounty-Update' into AI-n-Stuff

# Conflicts:
#	EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h
This commit is contained in:
Philip W 2024-03-22 12:19:29 +00:00
commit edf05035d0
23 changed files with 57 additions and 18 deletions

View File

@ -105,6 +105,8 @@ bSkipMovies=False
+MapsToCook=(FilePath="/Game/Levels/TempOpenWorld") +MapsToCook=(FilePath="/Game/Levels/TempOpenWorld")
+MapsToCook=(FilePath="/Game/Levels/EnemyAITest") +MapsToCook=(FilePath="/Game/Levels/EnemyAITest")
+MapsToCook=(FilePath="/Game/Levels/OpenWorldRework") +MapsToCook=(FilePath="/Game/Levels/OpenWorldRework")
+MapsToCook=(FilePath="/Game/BountySystem/ApartmentBounty/LevelInstances/MarketAreaEnemies")
+MapsToCook=(FilePath="/Game/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies")
+DirectoriesToAlwaysCook=(Path="/Interchange/Functions") +DirectoriesToAlwaysCook=(Path="/Interchange/Functions")
+DirectoriesToAlwaysCook=(Path="/Interchange/gltf") +DirectoriesToAlwaysCook=(Path="/Interchange/gltf")
+DirectoriesToAlwaysCook=(Path="/Interchange/Materials") +DirectoriesToAlwaysCook=(Path="/Interchange/Materials")

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

@ -194,6 +194,7 @@ void ABountyHunterCharacter::CreatePauseMenuTabs()
BountiesTab->TrackSideBountyDelegate.AddDynamic(this, &ABountyHunterCharacter::TrackSideBounty); BountiesTab->TrackSideBountyDelegate.AddDynamic(this, &ABountyHunterCharacter::TrackSideBounty);
} }
UpdateBountyTabInfo(); UpdateBountyTabInfo();
EarnFavours(10);
FavoursTab = CreateWidget<UTabWidget>(GetWorld(), FavoursTabWidgetClass); FavoursTab = CreateWidget<UTabWidget>(GetWorld(), FavoursTabWidgetClass);
NavigationTab = CreateWidget<UTabWidget>(GetWorld(), NavigationTabWidgetClass); NavigationTab = CreateWidget<UTabWidget>(GetWorld(), NavigationTabWidgetClass);
SettingsTab = CreateWidget<UTabWidget>(GetWorld(), SettingsTabWidgetClass); SettingsTab = CreateWidget<UTabWidget>(GetWorld(), SettingsTabWidgetClass);