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

added mannequin, editing hand menu
Merge remote-tracking branch 'origin/dens' into jonas
2025-06-14 23:44:43 +03:00 · 2025-06-14 23:43:32 +03:00 · 2025-06-14 22:16:59 +03:00 · 2025-06-14 21:46:03 +03:00 · 2025-06-14 20:09:26 +03:00 · 2025-06-14 19:27:27 +03:00
18 changed files with 50 additions and 2 deletions
--- a/Content/HandMenu/BP_SelectionMenu.uasset
+++ b/Content/HandMenu/BP_SelectionMenu.uasset
--- a/Content/StageAssets/BP_Mannequin.uasset
+++ b/Content/StageAssets/BP_Mannequin.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
Jonas	05562b8bab	Merge remote-tracking branch 'origin/mad' into jonas	2025-06-14 23:44:43 +03:00
Jonas	33e48fe9a7	added mannequin, editing hand menu	2025-06-14 23:43:32 +03:00
Jonas	b2bec43012	Merge remote-tracking branch 'origin/dens' into jonas	2025-06-14 22:16:59 +03:00
Dens_Enrijs_Lakucs	0b913431e6	added mannequin	2025-06-14 21:46:03 +03:00
Jonas	d5e3de7159	Merge remote-tracking branch 'origin/dens' into jonas	2025-06-14 20:09:26 +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