Merge branch 'dens' of https://cgvrgit.ulno.net/kaljomad/edmunds_fanclub into bernhards

Lights uhh stuff
2025-06-14 22:38:15 +03:00 · 2025-06-14 22:06:14 +03:00
55 changed files with 34 additions and 142 deletions
--- a/Content/AdjustableSpotLight.uasset
+++ b/Content/AdjustableSpotLight.uasset
--- a/Content/CineCameraActor_Blueprint_Blueprint.uasset
+++ b/Content/CineCameraActor_Blueprint_Blueprint.uasset
--- a/Content/DomLightControlSphere.uasset
+++ b/Content/DomLightControlSphere.uasset
--- a/Content/Grid.uasset
+++ b/Content/Grid.uasset
--- a/Content/HandMenu/BP_Menu_Hand_Modifier.uasset
+++ b/Content/HandMenu/BP_Menu_Hand_Modifier.uasset
--- a/Content/HandMenu/BP_SelectionMenu.uasset
+++ b/Content/HandMenu/BP_SelectionMenu.uasset
--- a/Content/HandMenu/Items/BP_HandMenuItem.uasset
+++ b/Content/HandMenu/Items/BP_HandMenuItem.uasset
--- a/Content/NewHapticFeedbackEffect_Curve.uasset
+++ b/Content/NewHapticFeedbackEffect_Curve.uasset
--- a/Content/SM_HandController.uasset
+++ b/Content/SM_HandController.uasset
--- a/Content/StageAssets/BP_DummyCamera.uasset
+++ b/Content/StageAssets/BP_DummyCamera.uasset
--- a/Content/StageAssets/BP_Mannequin.uasset
+++ b/Content/StageAssets/BP_Mannequin.uasset
--- a/Content/VRTemplate/Blueprints/GrabComponent.uasset
+++ b/Content/VRTemplate/Blueprints/GrabComponent.uasset
--- a/Content/VRTemplate/Blueprints/Pistol.uasset
+++ b/Content/VRTemplate/Blueprints/Pistol.uasset
--- a/Content/VRTemplate/Blueprints/RT_camera.uasset
+++ b/Content/VRTemplate/Blueprints/RT_camera.uasset
--- a/Content/VRTemplate/Blueprints/VRPawn.uasset
+++ b/Content/VRTemplate/Blueprints/VRPawn.uasset
--- a/Content/VRTemplate/Cameramaterial.uasset
+++ b/Content/VRTemplate/Cameramaterial.uasset
--- a/Content/VRTemplate/Maps/VRTemplateMap.umap
+++ b/Content/VRTemplate/Maps/VRTemplateMap.umap
--- a/Content/WoodManequin/Barrel/barrel_basecolor.uasset
+++ b/Content/WoodManequin/Barrel/barrel_basecolor.uasset
--- a/Content/WoodManequin/Barrel/barrel_metal.uasset
+++ b/Content/WoodManequin/Barrel/barrel_metal.uasset
--- a/Content/WoodManequin/Barrel/barrel_norm.uasset
+++ b/Content/WoodManequin/Barrel/barrel_norm.uasset
--- a/Content/WoodManequin/Barrel/barrel_rough.uasset
+++ b/Content/WoodManequin/Barrel/barrel_rough.uasset
--- a/Content/WoodManequin/Barrel/m_barrel_001.uasset
+++ b/Content/WoodManequin/Barrel/m_barrel_001.uasset
--- a/Content/WoodManequin/Barrel/medieval_barrel.uasset
+++ b/Content/WoodManequin/Barrel/medieval_barrel.uasset
--- a/Content/WoodManequin/Lights/ARRI_Skypanel/ARRI_Skylight.uasset
+++ b/Content/WoodManequin/Lights/ARRI_Skypanel/ARRI_Skylight.uasset
--- a/Content/WoodManequin/Lights/ARRI_Skypanel/Base.uasset
+++ b/Content/WoodManequin/Lights/ARRI_Skypanel/Base.uasset
--- a/Content/WoodManequin/Lights/ARRI_Skypanel/Base1.uasset
+++ b/Content/WoodManequin/Lights/ARRI_Skypanel/Base1.uasset
--- a/Content/WoodManequin/Lights/ARRI_Skypanel/Chrom.uasset
+++ b/Content/WoodManequin/Lights/ARRI_Skypanel/Chrom.uasset
--- a/Content/WoodManequin/Lights/ARRI_Skypanel/Chrom1.uasset
+++ b/Content/WoodManequin/Lights/ARRI_Skypanel/Chrom1.uasset
--- a/Content/WoodManequin/Lights/ARRI_Skypanel/Chrom_001.uasset
+++ b/Content/WoodManequin/Lights/ARRI_Skypanel/Chrom_001.uasset
--- a/Content/WoodManequin/Lights/ARRI_Skypanel/Chrom_0011.uasset
+++ b/Content/WoodManequin/Lights/ARRI_Skypanel/Chrom_0011.uasset
--- a/Content/WoodManequin/Lights/ARRI_Skypanel/Dark_Grey.uasset
+++ b/Content/WoodManequin/Lights/ARRI_Skypanel/Dark_Grey.uasset
--- a/Content/WoodManequin/Lights/ARRI_Skypanel/Dark_Grey1.uasset
+++ b/Content/WoodManequin/Lights/ARRI_Skypanel/Dark_Grey1.uasset
--- a/Content/WoodManequin/Lights/ARRI_Skypanel/Glass.uasset
+++ b/Content/WoodManequin/Lights/ARRI_Skypanel/Glass.uasset
--- a/Content/WoodManequin/Lights/ARRI_Skypanel/Glass1.uasset
+++ b/Content/WoodManequin/Lights/ARRI_Skypanel/Glass1.uasset
--- a/Content/WoodManequin/Lights/ARRI_Skypanel/Material_001.uasset
+++ b/Content/WoodManequin/Lights/ARRI_Skypanel/Material_001.uasset
--- a/Content/WoodManequin/Lights/Box_Spot_Light/Box_Panel_Light.uasset
+++ b/Content/WoodManequin/Lights/Box_Spot_Light/Box_Panel_Light.uasset
--- a/Content/WoodManequin/Lights/Box_Spot_Light/Box_Panel_Light_Bulb_M_Base_color.uasset
+++ b/Content/WoodManequin/Lights/Box_Spot_Light/Box_Panel_Light_Bulb_M_Base_color.uasset
--- a/Content/WoodManequin/Lights/Box_Spot_Light/Box_Panel_Light_Metal_M_Base_color.uasset
+++ b/Content/WoodManequin/Lights/Box_Spot_Light/Box_Panel_Light_Metal_M_Base_color.uasset
--- a/Content/WoodManequin/Lights/Box_Spot_Light/Box_Panel_Light_Metal_M_Normal.uasset
+++ b/Content/WoodManequin/Lights/Box_Spot_Light/Box_Panel_Light_Metal_M_Normal.uasset
--- a/Content/WoodManequin/Lights/Box_Spot_Light/Box_Panel_Light_Metal_M_Roughness.uasset
+++ b/Content/WoodManequin/Lights/Box_Spot_Light/Box_Panel_Light_Metal_M_Roughness.uasset
--- a/Content/WoodManequin/Lights/Box_Spot_Light/Flat_Panel_Light_Bulb_M.uasset
+++ b/Content/WoodManequin/Lights/Box_Spot_Light/Flat_Panel_Light_Bulb_M.uasset
--- a/Content/WoodManequin/Lights/Box_Spot_Light/Flat_Panel_Light_Metal_M.uasset
+++ b/Content/WoodManequin/Lights/Box_Spot_Light/Flat_Panel_Light_Metal_M.uasset
--- a/Content/WoodManequin/Lights/StudioLight/Studio_Light.uasset
+++ b/Content/WoodManequin/Lights/StudioLight/Studio_Light.uasset
--- a/Content/WoodManequin/Lights/StudioLight/_LMP0001_Textures.uasset
+++ b/Content/WoodManequin/Lights/StudioLight/_LMP0001_Textures.uasset
--- a/Content/WoodManequin/Lights/StudioLight/_LMP0001_Textures1.uasset
+++ b/Content/WoodManequin/Lights/StudioLight/_LMP0001_Textures1.uasset
--- a/Content/WoodManequin/Lights/StudioLight/_LMP0001_Textures_COL_1k.uasset
+++ b/Content/WoodManequin/Lights/StudioLight/_LMP0001_Textures_COL_1k.uasset
--- a/Content/WoodManequin/Lights/StudioLight/_LMP0001_Textures_METL_1k.uasset
+++ b/Content/WoodManequin/Lights/StudioLight/_LMP0001_Textures_METL_1k.uasset
--- a/Content/WoodManequin/Lights/StudioLight/_LMP0001_Textures_NRML_1k.uasset
+++ b/Content/WoodManequin/Lights/StudioLight/_LMP0001_Textures_NRML_1k.uasset
--- a/Content/WoodManequin/Lights/StudioLight/_LMP0001_Textures_ROUGH_1k.uasset
+++ b/Content/WoodManequin/Lights/StudioLight/_LMP0001_Textures_ROUGH_1k.uasset
--- a/Content/WoodManequin/WoodManequin_PhysicsAsset.uasset
+++ b/Content/WoodManequin/WoodManequin_PhysicsAsset.uasset
--- a/Content/WoodManequin/Wooden_cart/Charette_DIFF.uasset
+++ b/Content/WoodManequin/Wooden_cart/Charette_DIFF.uasset
--- a/Content/WoodManequin/Wooden_cart/Charette_NM.uasset
+++ b/Content/WoodManequin/Wooden_cart/Charette_NM.uasset
--- a/Content/WoodManequin/Wooden_cart/Charette_ROUGH.uasset
+++ b/Content/WoodManequin/Wooden_cart/Charette_ROUGH.uasset
--- a/Content/WoodManequin/Wooden_cart/Wooden_Cart.uasset
+++ b/Content/WoodManequin/Wooden_cart/Wooden_Cart.uasset
--- a/Content/WoodManequin/Wooden_cart/wire_140088225.uasset
+++ b/Content/WoodManequin/Wooden_cart/wire_140088225.uasset
Author	SHA1	Message	Date
Bmo	30bd771e75	Merge branch 'dens' of https://cgvrgit.ulno.net/kaljomad/edmunds_fanclub into bernhards	2025-06-14 22:38:15 +03:00
Bmo	afa83b5fdd	Lights uhh stuff	2025-06-14 22:06:14 +03:00