Merge of Volumentric fog from alternate work

merge of brads fog changes
2025-12-11 18:38:30 -07:00 · 2025-12-11 17:52:25 -07:00
144 changed files with 0 additions and 0 deletions
--- a/Content/Enemies/BluePrints/BP_HostileCube.uasset
+++ b/Content/Enemies/BluePrints/BP_HostileCube.uasset
--- a/Content/Enemies/BluePrints/NewBlueprint.uasset
+++ b/Content/Enemies/BluePrints/NewBlueprint.uasset
--- a/Content/Maps/MakingFog/BP_FlickeringLight.uasset
+++ b/Content/Maps/MakingFog/BP_FlickeringLight.uasset
--- a/Content/Maps/MakingFog/MI_Vol_Fog.uasset
+++ b/Content/Maps/MakingFog/MI_Vol_Fog.uasset
--- a/Content/Maps/MakingFog/MI_Vol_Fog_Small.uasset
+++ b/Content/Maps/MakingFog/MI_Vol_Fog_Small.uasset
--- a/Content/Maps/MakingFog/MPC_PlayerPosition.uasset
+++ b/Content/Maps/MakingFog/MPC_PlayerPosition.uasset
--- a/Content/Maps/MakingFog/Torch.uasset
+++ b/Content/Maps/MakingFog/Torch.uasset
--- a/Content/Maps/MakingFog/Volumetric_Fog.uasset
+++ b/Content/Maps/MakingFog/Volumetric_Fog.uasset
--- a/Content/Maps/MakingFog/Volumetric_Fog_Circle.uasset
+++ b/Content/Maps/MakingFog/Volumetric_Fog_Circle.uasset
--- a/Content/Maps/MakingFog/Volumetric_Fog_Large.uasset
+++ b/Content/Maps/MakingFog/Volumetric_Fog_Large.uasset
--- a/Content/Maps/MakingFog/Volumetric_Fogbkup.uasset
+++ b/Content/Maps/MakingFog/Volumetric_Fogbkup.uasset
--- a/Content/Maps/SM_MultiCoupler.uasset
+++ b/Content/Maps/SM_MultiCoupler.uasset
--- a/Content/Maps/SM_MultiCouplerAtmp2.uasset
+++ b/Content/Maps/SM_MultiCouplerAtmp2.uasset
--- a/Content/Maps/SM_SM_MultiCoupler.uasset
+++ b/Content/Maps/SM_SM_MultiCoupler.uasset
--- a/Content/Maps/SM_SM_MultiCouplerAtmp2.uasset
+++ b/Content/Maps/SM_SM_MultiCouplerAtmp2.uasset
--- a/Content/Maps/SM_test.uasset
+++ b/Content/Maps/SM_test.uasset
--- a/Content/Maps/TestMaps/GeneratedMeshes/WorkInProgress/Finished/Room_Prefabs/SM_MultiCouplerAtmp3.uasset
+++ b/Content/Maps/TestMaps/GeneratedMeshes/WorkInProgress/Finished/Room_Prefabs/SM_MultiCouplerAtmp3.uasset
--- a/Content/Maps/TestMaps/ReadyForImplementation/Corridors/SplitLeft/SM_Floor_Revised.uasset
+++ b/Content/Maps/TestMaps/ReadyForImplementation/Corridors/SplitLeft/SM_Floor_Revised.uasset
--- a/Content/Maps/TestMaps/ReadyForImplementation/Corridors/Straight/SM_Floor.uasset
+++ b/Content/Maps/TestMaps/ReadyForImplementation/Corridors/Straight/SM_Floor.uasset
--- a/Content/Maps/TestMaps/ReadyForImplementation/Rooms/CircularRoom/1Door/SM_Again.uasset
+++ b/Content/Maps/TestMaps/ReadyForImplementation/Rooms/CircularRoom/1Door/SM_Again.uasset
--- a/Content/Maps/TestMaps/ReadyForImplementation/Rooms/CircularRoom/1Door/SM_Again1.uasset
+++ b/Content/Maps/TestMaps/ReadyForImplementation/Rooms/CircularRoom/1Door/SM_Again1.uasset
--- a/Content/Maps/TestMaps/ReadyForImplementation/Rooms/CircularRoom/FullDoor/SM_Premade.uasset
+++ b/Content/Maps/TestMaps/ReadyForImplementation/Rooms/CircularRoom/FullDoor/SM_Premade.uasset
--- a/Content/Maps/TestMaps/ReadyForImplementation/Rooms/Long2x2DoorModules/SM_Skeleton.uasset
+++ b/Content/Maps/TestMaps/ReadyForImplementation/Rooms/Long2x2DoorModules/SM_Skeleton.uasset
--- a/Content/Maps/TestMaps/ReadyForImplementation/Rooms/LongCornerDoor/SM_Skeleton.uasset
+++ b/Content/Maps/TestMaps/ReadyForImplementation/Rooms/LongCornerDoor/SM_Skeleton.uasset
--- a/Content/Maps/TestMaps/ReadyForImplementation/Rooms/LongCornerDoor/SM_skin.uasset
+++ b/Content/Maps/TestMaps/ReadyForImplementation/Rooms/LongCornerDoor/SM_skin.uasset
--- a/Content/Maps/TestMaps/ReadyForImplementation/Rooms/SquareCornerModules/SM_Skeleton.uasset
+++ b/Content/Maps/TestMaps/ReadyForImplementation/Rooms/SquareCornerModules/SM_Skeleton.uasset
--- a/Content/Maps/TestMaps/ReadyForImplementation/Rooms/SquareCornerModules/SM_Skin1.uasset
+++ b/Content/Maps/TestMaps/ReadyForImplementation/Rooms/SquareCornerModules/SM_Skin1.uasset
--- a/Content/Maps/TestMaps/ReadyForImplementation/SM_SM_DoorDodadFixed.uasset
+++ b/Content/Maps/TestMaps/ReadyForImplementation/SM_SM_DoorDodadFixed.uasset
--- a/Content/Maps/TestMaps/TestMaps/SM_CircleRoomFab.uasset
+++ b/Content/Maps/TestMaps/TestMaps/SM_CircleRoomFab.uasset
--- a/Content/Maps/Testmap.umap
+++ b/Content/Maps/Testmap.umap
--- a/Content/Maps/Torch.uasset
+++ b/Content/Maps/Torch.uasset
--- a/Content/Maps/_GENERATED/james/Boolean_1A7886A4.uasset
+++ b/Content/Maps/_GENERATED/james/Boolean_1A7886A4.uasset
--- a/Content/Maps/_GENERATED/james/Boolean_52ADACEE.uasset
+++ b/Content/Maps/_GENERATED/james/Boolean_52ADACEE.uasset
--- a/Content/Maps/_GENERATED/james/Boolean_A4B348E2.uasset
+++ b/Content/Maps/_GENERATED/james/Boolean_A4B348E2.uasset
--- a/Content/Maps/_GENERATED/james/Box_0A806260.uasset
+++ b/Content/Maps/_GENERATED/james/Box_0A806260.uasset
--- a/Content/Maps/_GENERATED/james/Box_8095F8D9.uasset
+++ b/Content/Maps/_GENERATED/james/Box_8095F8D9.uasset
--- a/Content/Maps/_GENERATED/james/Box_B2DD0EB6.uasset
+++ b/Content/Maps/_GENERATED/james/Box_B2DD0EB6.uasset
--- a/Content/Maps/_GENERATED/james/Box_E1CAEB45.uasset
+++ b/Content/Maps/_GENERATED/james/Box_E1CAEB45.uasset
--- a/Content/Maps/asdfasdf.umap
+++ b/Content/Maps/asdfasdf.umap
--- a/Content/Procedural_Dungeon/BluePrints/BP_Dungeon_Generation.uasset
+++ b/Content/Procedural_Dungeon/BluePrints/BP_Dungeon_Generation.uasset
--- a/Content/Procedural_Dungeon/BluePrints/Entities/BKUPForceFieldDoor.uasset
+++ b/Content/Procedural_Dungeon/BluePrints/Entities/BKUPForceFieldDoor.uasset
--- a/Content/Procedural_Dungeon/BluePrints/Entities/Doors/FieldDoor_Gothic.uasset
+++ b/Content/Procedural_Dungeon/BluePrints/Entities/Doors/FieldDoor_Gothic.uasset
--- a/Content/Procedural_Dungeon/BluePrints/FloorPlans/Default/BP_10_Theme_LongRoomCorners.uasset
+++ b/Content/Procedural_Dungeon/BluePrints/FloorPlans/Default/BP_10_Theme_LongRoomCorners.uasset
--- a/Content/Procedural_Dungeon/BluePrints/FloorPlans/Default/BP_10_Theme_Longroom2x2.uasset
+++ b/Content/Procedural_Dungeon/BluePrints/FloorPlans/Default/BP_10_Theme_Longroom2x2.uasset
--- a/Content/Procedural_Dungeon/BluePrints/FloorPlans/Default/BP_10_Theme_SquareCornerDoor.uasset
+++ b/Content/Procedural_Dungeon/BluePrints/FloorPlans/Default/BP_10_Theme_SquareCornerDoor.uasset
--- a/Content/Procedural_Dungeon/BluePrints/FloorPlans/Default/BP_3_Theme_Circular.uasset
+++ b/Content/Procedural_Dungeon/BluePrints/FloorPlans/Default/BP_3_Theme_Circular.uasset
--- a/Content/Procedural_Dungeon/BluePrints/FloorPlans/Default/BP_3_Theme_Corridor1V.uasset
+++ b/Content/Procedural_Dungeon/BluePrints/FloorPlans/Default/BP_3_Theme_Corridor1V.uasset
--- a/Content/Procedural_Dungeon/BluePrints/FloorPlans/Default/BP_3_Theme_Corridor2V.uasset
+++ b/Content/Procedural_Dungeon/BluePrints/FloorPlans/Default/BP_3_Theme_Corridor2V.uasset
--- a/Content/Procedural_Dungeon/BluePrints/FloorPlans/Default/BP_3_Theme_Corridor3V.uasset
+++ b/Content/Procedural_Dungeon/BluePrints/FloorPlans/Default/BP_3_Theme_Corridor3V.uasset
--- a/Content/Procedural_Dungeon/BluePrints/FloorPlans/Default/BP_3_Theme_Corridor4V.uasset
+++ b/Content/Procedural_Dungeon/BluePrints/FloorPlans/Default/BP_3_Theme_Corridor4V.uasset
--- a/Content/Procedural_Dungeon/BluePrints/FloorPlans/Default/BP_3_Theme_CorridorSplit4Way1V.uasset
+++ b/Content/Procedural_Dungeon/BluePrints/FloorPlans/Default/BP_3_Theme_CorridorSplit4Way1V.uasset
--- a/Content/Procedural_Dungeon/BluePrints/FloorPlans/Default/BP_3_Theme_CorridorSplit4Way2V.uasset
+++ b/Content/Procedural_Dungeon/BluePrints/FloorPlans/Default/BP_3_Theme_CorridorSplit4Way2V.uasset
--- a/Content/Procedural_Dungeon/BluePrints/FloorPlans/Default/BP_3_Theme_CorridorSplitL.uasset
+++ b/Content/Procedural_Dungeon/BluePrints/FloorPlans/Default/BP_3_Theme_CorridorSplitL.uasset
--- a/Content/Procedural_Dungeon/BluePrints/FloorPlans/Default/BP_3_Theme_CorridorSplitR.uasset
+++ b/Content/Procedural_Dungeon/BluePrints/FloorPlans/Default/BP_3_Theme_CorridorSplitR.uasset
--- a/Content/Procedural_Dungeon/BluePrints/FloorPlans/Default/BP_3_Theme_CorridorSshape.uasset
+++ b/Content/Procedural_Dungeon/BluePrints/FloorPlans/Default/BP_3_Theme_CorridorSshape.uasset
--- a/Content/Procedural_Dungeon/BluePrints/FloorPlans/Default/BP_3_Theme_CorridorTshape.uasset
+++ b/Content/Procedural_Dungeon/BluePrints/FloorPlans/Default/BP_3_Theme_CorridorTshape.uasset
--- a/Content/Procedural_Dungeon/BluePrints/FloorPlans/Default/Special/BP_300_Theme_2FloorHalfScale.uasset
+++ b/Content/Procedural_Dungeon/BluePrints/FloorPlans/Default/Special/BP_300_Theme_2FloorHalfScale.uasset
--- a/Content/Procedural_Dungeon/BluePrints/FloorPlans/Default/Special/BP_75_Theme_Circular1door.uasset
+++ b/Content/Procedural_Dungeon/BluePrints/FloorPlans/Default/Special/BP_75_Theme_Circular1door.uasset
--- a/Content/Procedural_Dungeon/BluePrints/FloorPlans/Default/Special/_BP_100_Theme_2FloorHalfScaleBkup.uasset
+++ b/Content/Procedural_Dungeon/BluePrints/FloorPlans/Default/Special/_BP_100_Theme_2FloorHalfScaleBkup.uasset
--- a/Content/Procedural_Dungeon/BluePrints/FloorPlans/Default/Special/_BP_3_Theme_Circular1doorbkup.uasset
+++ b/Content/Procedural_Dungeon/BluePrints/FloorPlans/Default/Special/_BP_3_Theme_Circular1doorbkup.uasset
--- a/Content/Procedural_Dungeon/Fog.uasset
+++ b/Content/Procedural_Dungeon/Fog.uasset
--- a/Content/Procedural_Dungeon/MI_Fog.uasset
+++ b/Content/Procedural_Dungeon/MI_Fog.uasset
--- a/Content/UI/PassivesTree/Data/PassiveNodeDetails.uasset
+++ b/Content/UI/PassivesTree/Data/PassiveNodeDetails.uasset
--- a/Content/_UnrealBoilerPlate/Characters/Mannequins/Materials/Instances/Manny/MI_Manny_01.uasset
+++ b/Content/_UnrealBoilerPlate/Characters/Mannequins/Materials/Instances/Manny/MI_Manny_01.uasset
--- a/Content/_UnrealBoilerPlate/Characters/Mannequins/Materials/Instances/Manny/MI_Manny_02.uasset
+++ b/Content/_UnrealBoilerPlate/Characters/Mannequins/Materials/Instances/Manny/MI_Manny_02.uasset
--- a/Content/_UnrealBoilerPlate/Characters/Mannequins/Meshes/SKM_Manny.uasset
+++ b/Content/_UnrealBoilerPlate/Characters/Mannequins/Meshes/SKM_Manny.uasset
--- a/Content/_UnrealBoilerPlate/Characters/Mannequins/Meshes/SKM_Manny_Simple.uasset
+++ b/Content/_UnrealBoilerPlate/Characters/Mannequins/Meshes/SKM_Manny_Simple.uasset
--- a/Content/_UnrealBoilerPlate/Characters/Mannequins/Meshes/SKM_Quinn.uasset
+++ b/Content/_UnrealBoilerPlate/Characters/Mannequins/Meshes/SKM_Quinn.uasset
--- a/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/ABP_Manny_PostProcess.uasset
+++ b/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/ABP_Manny_PostProcess.uasset
--- a/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/ABP_Quinn_PostProcess.uasset
+++ b/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/ABP_Quinn_PostProcess.uasset
--- a/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/CR_Mannequin_Body.uasset
+++ b/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/CR_Mannequin_Body.uasset
--- a/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/CR_Mannequin_Procedural.uasset
+++ b/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/CR_Mannequin_Procedural.uasset
--- a/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_calf_l_anim.uasset
+++ b/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_calf_l_anim.uasset
--- a/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_calf_l_pose.uasset
+++ b/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_calf_l_pose.uasset
--- a/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_calf_r_anim.uasset
+++ b/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_calf_r_anim.uasset
--- a/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_calf_r_pose.uasset
+++ b/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_calf_r_pose.uasset
--- a/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_clavicle_l_anim.uasset
+++ b/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_clavicle_l_anim.uasset
--- a/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_clavicle_l_pose.uasset
+++ b/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_clavicle_l_pose.uasset
--- a/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_clavicle_r_anim.uasset
+++ b/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_clavicle_r_anim.uasset
--- a/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_clavicle_r_pose.uasset
+++ b/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_clavicle_r_pose.uasset
--- a/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_foot_l_anim.uasset
+++ b/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_foot_l_anim.uasset
--- a/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_foot_l_pose.uasset
+++ b/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_foot_l_pose.uasset
--- a/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_foot_r_anim.uasset
+++ b/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_foot_r_anim.uasset
--- a/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_foot_r_pose.uasset
+++ b/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_foot_r_pose.uasset
--- a/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_hand_l_anim.uasset
+++ b/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_hand_l_anim.uasset
--- a/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_hand_l_pose.uasset
+++ b/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_hand_l_pose.uasset
--- a/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_hand_r_anim.uasset
+++ b/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_hand_r_anim.uasset
--- a/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_hand_r_pose.uasset
+++ b/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_hand_r_pose.uasset
--- a/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_lowerarm_l_anim.uasset
+++ b/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_lowerarm_l_anim.uasset
--- a/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_lowerarm_l_pose.uasset
+++ b/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_lowerarm_l_pose.uasset
--- a/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_lowerarm_r_anim.uasset
+++ b/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_lowerarm_r_anim.uasset
--- a/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_lowerarm_r_pose.uasset
+++ b/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_lowerarm_r_pose.uasset
--- a/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_thigh_l_anim.uasset
+++ b/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_thigh_l_anim.uasset
--- a/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_thigh_l_pose.uasset
+++ b/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_thigh_l_pose.uasset
--- a/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_thigh_r_anim.uasset
+++ b/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_thigh_r_anim.uasset
--- a/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_thigh_r_pose.uasset
+++ b/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_thigh_r_pose.uasset
--- a/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_upperarm_l_anim.uasset
+++ b/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_upperarm_l_anim.uasset
--- a/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_upperarm_l_pose.uasset
+++ b/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_upperarm_l_pose.uasset
--- a/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_upperarm_r_anim.uasset
+++ b/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_upperarm_r_anim.uasset
--- a/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_upperarm_r_pose.uasset
+++ b/Content/_UnrealBoilerPlate/Characters/Mannequins/Rigs/Poses/Manny/Manny_upperarm_r_pose.uasset
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Zhire	248cf570dc	Merge of Volumentric fog from alternate work	2025-12-11 18:38:30 -07:00
Zhire	49e17feb6a	merge of brads fog changes	2025-12-11 17:52:25 -07:00