Merge branch 'Environment-Miami' into dev

EndlessVendetta/Config/DefaultGame.ini

@@ -14,7 +14,7 @@ Build=IfProjectHasCode
 BuildConfiguration=PPBC_Development
 BuildTarget=
 LaunchOnTarget=
-StagingDirectory=(Path="")
+StagingDirectory=(Path="C:/Falmouth_schoolWork/Year3/Builds/Vendetta-0.8")
 FullRebuild=False
 ForDistribution=False
 IncludeDebugFiles=False
@@ -99,22 +99,20 @@ bSkipMovies=False
 -IniSectionDenylist=StorageServers
 +IniSectionDenylist=HordeStorageServers
 +IniSectionDenylist=StorageServers
-+MapsToCook=(FilePath="/Game/Levels/ControlTutorialLevel")
 +MapsToCook=(FilePath="/Game/Levels/Apartment_hit")
 +MapsToCook=(FilePath="/Game/Levels/MainMenuLevel")
-+MapsToCook=(FilePath="/Game/Levels/TempOpenWorld")
-+MapsToCook=(FilePath="/Game/Levels/EnemyAITest")
 +MapsToCook=(FilePath="/Game/Levels/OpenWorldRework")
 +MapsToCook=(FilePath="/Game/BountySystem/ApartmentBounty/LevelInstances/MarketAreaEnemies")
 +MapsToCook=(FilePath="/Game/BountySystem/ApartmentBounty/LevelInstances/PachinkoEnemies")
 +MapsToCook=(FilePath="/Game/Levels/TempLevels/NewTutorialMap")
++MapsToCook=(FilePath="/Game/BountySystem/ApartmentBounty/LevelInstances/ApartmentWave")
 +DirectoriesToAlwaysCook=(Path="/Interchange/Functions")
 +DirectoriesToAlwaysCook=(Path="/Interchange/gltf")
 +DirectoriesToAlwaysCook=(Path="/Interchange/Materials")
 +DirectoriesToAlwaysCook=(Path="/Interchange/Pipelines")
 +DirectoriesToAlwaysCook=(Path="/Interchange/Utilities")
-PerPlatformBuildConfig=()
-PerPlatformTargetFlavorName=()
+PerPlatformBuildConfig=(("Windows", PPBC_Shipping))
+PerPlatformTargetFlavorName=(("Android", "Android_ASTC"))
 PerPlatformBuildTarget=()
 
 [/Script/AsyncLoadingScreen.LoadingScreenSettings]

EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/MayorPortrait2.uasset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4e7bd86ff1d073d7e0089aa24ac949d152c3823fc17e007a5776cf056bde3be2
+size 347132

EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp

@@ -884,6 +884,10 @@ bool AEndlessVendettaCharacter::UpdateGadgetType(TSubclassOf<AGadgetBase> NewGad
 		GadgetManager->SpawnGadget(NewGadgetClass, Cast<UCameraComponent>(PlayersCamera));
 		break;
 	}
+
+	if (NewGadgetClass.GetDefaultObject()->IsA(AReconGadget::StaticClass())) ToggleRecon();
+	else if (NewGadgetClass.GetDefaultObject()->IsA(ACombatGadget::StaticClass())) ToggleCombat();
+	
 	return true;
 }