Merge branch 'Main-Bounty-Update' into AI-n-Stuff
# Conflicts: # EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h
This commit is contained in:
commit
edf05035d0
@ -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")
|
||||||
|
BIN
EndlessVendetta/Content/Assets/Objects/OpenWorld/VENT/Material.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Objects/OpenWorld/VENT/Material.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/Assets/Objects/OpenWorld/VENT/Vent.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/Assets/Objects/OpenWorld/VENT/Vent.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/PachinkoOwner/BP_PachinkoOwner.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/BountySystem/ApartmentBounty/AI/PachinkoOwner/BP_PachinkoOwner.uasset
(Stored with Git LFS)
Binary file not shown.
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies.umap
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies.umap
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/CP_FinalCheckpoint.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/BountySystem/CP_FinalCheckpoint.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/BountySystem/WBP_OpenWorldTips.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/BountySystem/WBP_OpenWorldTips.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/Levels/Apartment_hit.umap
(Stored with Git LFS)
BIN
EndlessVendetta/Content/Levels/Apartment_hit.umap
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/Levels/ControlTutorialLevel.umap
(Stored with Git LFS)
BIN
EndlessVendetta/Content/Levels/ControlTutorialLevel.umap
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/Levels/OpenWorldRework.umap
(Stored with Git LFS)
BIN
EndlessVendetta/Content/Levels/OpenWorldRework.umap
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
(Stored with Git LFS)
BIN
EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
EndlessVendetta/Content/__ExternalActors__/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies/1/7S/C7B91LA1JCEE2F9DH3GRNW.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/__ExternalActors__/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies/1/7S/C7B91LA1JCEE2F9DH3GRNW.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/__ExternalActors__/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies/1/VE/5UUFSL2KJHX63MMCII5TBD.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/__ExternalActors__/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies/1/VE/5UUFSL2KJHX63MMCII5TBD.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/__ExternalActors__/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies/2/6R/LMJ1CQ0M42YIAASZ5RC79J.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/__ExternalActors__/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies/2/6R/LMJ1CQ0M42YIAASZ5RC79J.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/__ExternalActors__/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies/4/Z5/YGSCACJJ7CDFIWH5PPG6EZ.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/__ExternalActors__/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies/4/Z5/YGSCACJJ7CDFIWH5PPG6EZ.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/__ExternalActors__/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies/7/HV/7VTDEJZ6EVN0HDMNCLA327.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/__ExternalActors__/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies/7/HV/7VTDEJZ6EVN0HDMNCLA327.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/__ExternalActors__/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies/D/64/VI2XT2MBUWXXJ16A2JROZP.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/__ExternalActors__/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies/D/64/VI2XT2MBUWXXJ16A2JROZP.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/__ExternalActors__/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies/D/T5/V4KL63P4GJZNZ3YW4433PK.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/__ExternalActors__/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies/D/T5/V4KL63P4GJZNZ3YW4433PK.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/__ExternalActors__/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies/E/77/4KB686NHOWSVOS11ADBN02.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/__ExternalActors__/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies/E/77/4KB686NHOWSVOS11ADBN02.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
EndlessVendetta/Content/__ExternalActors__/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies/E/PI/SX1D1XV4LIFTTDZONWUS18.uasset
(Stored with Git LFS)
Normal file
BIN
EndlessVendetta/Content/__ExternalActors__/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies/E/PI/SX1D1XV4LIFTTDZONWUS18.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -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);
|
||||||
|
Loading…
Reference in New Issue
Block a user