Merge remote-tracking branch 'origin/dens' into jonas

fixed model spawn pos, added light dummy
2025-06-14 22:16:59 +03:00 · 2025-06-14 20:09:26 +03:00 · 2025-06-14 20:02:05 +03:00 · 2025-06-14 19:34:13 +03:00 · 2025-06-14 18:38:18 +03:00 · 2025-06-14 18:37:35 +03:00
59 changed files with 45 additions and 144 deletions
--- a/Content/AdjustablePointLIght.uasset
+++ b/Content/AdjustablePointLIght.uasset
--- a/Content/CineCameraActor_Blueprint_Blueprint.uasset
+++ b/Content/CineCameraActor_Blueprint_Blueprint.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/SM_HandController.uasset
+++ b/Content/SM_HandController.uasset
--- a/Content/StageAssets/BP_Asset_Modifier.uasset
+++ b/Content/StageAssets/BP_Asset_Modifier.uasset
--- a/Content/StageAssets/BP_DummyAsset.uasset
+++ b/Content/StageAssets/BP_DummyAsset.uasset
--- a/Content/StageAssets/BP_DummyLight.uasset
+++ b/Content/StageAssets/BP_DummyLight.uasset
--- a/Content/StageAssets/BP_Mannequin.uasset
+++ b/Content/StageAssets/BP_Mannequin.uasset
--- a/Content/StageAssets/aiStandardSurface3.uasset
+++ b/Content/StageAssets/aiStandardSurface3.uasset
--- a/Content/StageAssets/body.uasset
+++ b/Content/StageAssets/body.uasset
--- a/Content/StageAssets/dress.uasset
+++ b/Content/StageAssets/dress.uasset
--- a/Content/StageAssets/manican.uasset
+++ b/Content/StageAssets/manican.uasset
--- a/Content/VRTemplate/Blueprints/GrabComponent.uasset
+++ b/Content/VRTemplate/Blueprints/GrabComponent.uasset
--- a/Content/VRTemplate/Blueprints/GrabType.uasset
+++ b/Content/VRTemplate/Blueprints/GrabType.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/Haptics/GrabHapticEffect.uasset
+++ b/Content/VRTemplate/Haptics/GrabHapticEffect.uasset
--- a/Content/VRTemplate/Maps/VRTemplateMap.umap
+++ b/Content/VRTemplate/Maps/VRTemplateMap.umap
--- a/Content/VRTemplate/Textures/T_Grid.uasset
+++ b/Content/VRTemplate/Textures/T_Grid.uasset
--- 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
Jonas	b2bec43012	Merge remote-tracking branch 'origin/dens' into jonas	2025-06-14 22:16:59 +03:00
Jonas	d5e3de7159	Merge remote-tracking branch 'origin/dens' into jonas	2025-06-14 20:09:26 +03:00
MSI\madli	1f6ec83f30	fixed model spawn pos, added light dummy	2025-06-14 20:02:05 +03:00
MSI\madli	e4db9ce59f	made the selectionmenu finally work like desired	2025-06-14 19:34:13 +03:00
Jonas	5d21e9cbc9	Merge branch 'mad' into jonas	2025-06-14 18:38:18 +03:00
MSI\madli	e52c47f721	some more on camera	2025-06-14 18:37:35 +03:00
Jonas	9b337f97d1	sync itemmenu onto hand	2025-06-14 18:30:16 +03:00
MSI\madli	09fbff1e5a	trying out hand menu	2025-06-14 18:15:16 +03:00
MSI\madli	71a8290648	made the left hand big again	2025-06-14 18:04:40 +03:00
Jonas	d5f67aa38f	Merge branch 'jonas' into mad	2025-06-14 17:46:35 +03:00
MSI\madli	fe34ba46a8	camera functionality	2025-06-14 17:45:08 +03:00
Jonas	5d1a9ae4df	putting menu on left arm and let it spawn stuff	2025-06-14 17:43:14 +03:00
MSI\madli	15e8a122e0	(j) fixing menu grab function	2025-06-14 16:13:44 +03:00