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

Lights uhh stuff
added mannequin
2025-06-14 22:38:15 +03:00 · 2025-06-14 22:06:14 +03:00 · 2025-06-14 21:46:03 +03:00 · 2025-06-14 19:27:27 +03:00 · 2025-06-14 19:24:21 +03:00
26 changed files with 70 additions and 10 deletions
--- a/Content/AdjustablePointLIght.uasset
+++ b/Content/AdjustablePointLIght.uasset
--- a/Content/AdjustableSpotLight.uasset
+++ b/Content/AdjustableSpotLight.uasset
--- a/Content/DomLightControlSphere.uasset
+++ b/Content/DomLightControlSphere.uasset
--- a/Content/Grid.uasset
+++ b/Content/Grid.uasset
--- a/Content/NewHapticFeedbackEffect_Curve.uasset
+++ b/Content/NewHapticFeedbackEffect_Curve.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/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/WoodManequin.uasset
+++ b/Content/WoodManequin/WoodManequin.uasset
--- a/Content/WoodManequin/WoodManequin_PhysicsAsset.uasset
+++ b/Content/WoodManequin/WoodManequin_PhysicsAsset.uasset
--- a/Content/WoodManequin/WoodManequin_Poses_Sequence.uasset
+++ b/Content/WoodManequin/WoodManequin_Poses_Sequence.uasset
--- a/Content/WoodManequin/WoodManequin_Skeleton.uasset
+++ b/Content/WoodManequin/WoodManequin_Skeleton.uasset
--- a/Content/WoodManequin/lay_figure_BaseColor_2K.uasset
+++ b/Content/WoodManequin/lay_figure_BaseColor_2K.uasset
--- a/Content/WoodManequin/lay_figure_Normal_2K.uasset
+++ b/Content/WoodManequin/lay_figure_Normal_2K.uasset
--- a/Content/WoodManequin/lay_figure_Roughness_2K.uasset
+++ b/Content/WoodManequin/lay_figure_Roughness_2K.uasset
--- a/Content/WoodManequin/lay_figure_material.uasset
+++ b/Content/WoodManequin/lay_figure_material.uasset
--- a/Content/Wood_Manequin/WoodManequin.fbx
+++ b/Content/Wood_Manequin/WoodManequin.fbx
--- a/Content/Wood_Manequin/WoodManequinPoses.xlsx
+++ b/Content/Wood_Manequin/WoodManequinPoses.xlsx
--- a/Content/Wood_Manequin/WoodManequin_Poses_Sequence.fbx
+++ b/Content/Wood_Manequin/WoodManequin_Poses_Sequence.fbx
--- a/Content/Wood_Manequin/wooden-mannequin-lay-figure-rigged/textures/lay_figure_BaseColor_2K.png
+++ b/Content/Wood_Manequin/wooden-mannequin-lay-figure-rigged/textures/lay_figure_BaseColor_2K.png
--- a/Content/Wood_Manequin/wooden-mannequin-lay-figure-rigged/textures/lay_figure_Emissive_4K.png
+++ b/Content/Wood_Manequin/wooden-mannequin-lay-figure-rigged/textures/lay_figure_Emissive_4K.png
--- a/Content/Wood_Manequin/wooden-mannequin-lay-figure-rigged/textures/lay_figure_Metallic_4K.png
+++ b/Content/Wood_Manequin/wooden-mannequin-lay-figure-rigged/textures/lay_figure_Metallic_4K.png
--- a/Content/Wood_Manequin/wooden-mannequin-lay-figure-rigged/textures/lay_figure_Normal_2K.png
+++ b/Content/Wood_Manequin/wooden-mannequin-lay-figure-rigged/textures/lay_figure_Normal_2K.png
--- a/Content/Wood_Manequin/wooden-mannequin-lay-figure-rigged/textures/lay_figure_Roughness_4K.png
+++ b/Content/Wood_Manequin/wooden-mannequin-lay-figure-rigged/textures/lay_figure_Roughness_4K.png
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
Dens_Enrijs_Lakucs	0b913431e6	added mannequin	2025-06-14 21:46:03 +03:00
Dens_Enrijs_Lakucs	028b8b7a73	Removed unneccesary files	2025-06-14 19:27:27 +03:00
Dens_Enrijs_Lakucs	a1041365df	Wood manequin	2025-06-14 19:24:21 +03:00