Compare commits

merge into: kaljomad:master

Branches Tags

kaljomad:master

kaljomad:mad

kaljomad:dens

kaljomad:jonas

kaljomad:bernhards

...

pull from: kaljomad:mad

Branches Tags

kaljomad:mad

kaljomad:dens

kaljomad:jonas

kaljomad:bernhards

kaljomad:master

54 Commits

master ... mad

Author	SHA1	Message	Date
MSI\madli	9fae5e9ee1	last one	2025-06-15 14:24:09 +03:00
MSI\madli	9e96a827d8	barrels and cart	2025-06-15 10:44:18 +03:00
MSI\madli	3270aa85e6	Merge branch 'dens' of https://cgvrgit.ulno.net/kaljomad/edmunds_fanclub into mad ... # Conflicts: # Content/CineCameraActor_Blueprint_Blueprint.uasset # Content/HandMenu/BP_Menu_Hand_Modifier.uasset # Content/HandMenu/BP_SelectionMenu.uasset # Content/HandMenu/Items/BP_HandMenuItem.uasset # Content/StageAssets/BP_Mannequin.uasset # Content/VRTemplate/Blueprints/GrabComponent.uasset # Content/VRTemplate/Blueprints/VRPawn.uasset # Content/VRTemplate/Cameramaterial.uasset # Content/VRTemplate/Maps/VRTemplateMap.umap	2025-06-15 10:38:23 +03:00
MSI\madli	49d562566c	nomessages	2025-06-15 10:33:24 +03:00
MSI\madli	fb4ec36350	better city material, better mannequin	2025-06-15 10:30:44 +03:00
MSI\madli	842d7a6b89	finally arrived in the city	2025-06-15 09:16:13 +03:00
Dens_Enrijs_Lakucs	24d2bd2a4b	Wooden cart and barrel	2025-06-15 07:47:14 +03:00
MSI\madli	c4ce414e2c	Merge branch 'mad' of https://cgvrgit.ulno.net/kaljomad/edmunds_fanclub into mad	2025-06-15 06:23:33 +03:00
MSI\madli	1fc282707c	templatemap	2025-06-15 06:20:40 +03:00
Jonas	c2139fc425	Merge remote-tracking branch 'origin/bernhards' into jonas	2025-06-15 06:19:24 +03:00
MSI\madli	8262b9e65c	handmenu items	2025-06-15 06:18:24 +03:00
Bmo	ff1615d0fb	The directional light control sphere is now a proper gimbal. Courtesy of Asj, very epik!!!!1111	2025-06-15 05:42:09 +03:00
Bmo	1e5335b47e	Directional Light attaches to the control sphere now	2025-06-15 05:21:04 +03:00
Bmo	dfbc5024d8	Mannequin pose slider, light intensity slider, spot light material	2025-06-15 05:01:05 +03:00
Jonas	7e35ad5a61	adding new hand menu design, added trash func	2025-06-15 04:57:29 +03:00
Jonas	4511ef7aca	erge remote-tracking branch 'origin/mad' into jonas	2025-06-15 04:55:18 +03:00
MSI\madli	8b8d4dc8c6	goodnight	2025-06-15 04:42:30 +03:00
Bmo	49d5628b80	Merge branch 'mad' of https://cgvrgit.ulno.net/kaljomad/edmunds_fanclub into bernhards	2025-06-15 01:38:41 +03:00
Bmo	0aaae3bb3a	Fixed grabbed object sticking to the inital hand if grabbing with another hand	2025-06-15 01:37:34 +03:00
MSI\madli	e7bb931a43	spawned an actual light on menu instead of this blocky stuff	2025-06-15 01:27:08 +03:00
Bmo	9951674ae4	Merge branch 'mad' of https://cgvrgit.ulno.net/kaljomad/edmunds_fanclub into bernhards	2025-06-15 01:23:27 +03:00
Bmo	6184edd3b3	Idk	2025-06-15 01:21:38 +03:00
MSI\madli	5415fa7079	fixed autograbbing and teleporting	2025-06-15 01:17:31 +03:00
Jonas	95ac2950d3	Merge branch 'jonas' into mad	2025-06-15 00:42:10 +03:00
MSI\madli	41d436df2a	nothing special	2025-06-15 00:39:34 +03:00
Jonas	eb7053729e	Merge branch 'bernhards' into jonas	2025-06-15 00:31:30 +03:00
MSI\madli	f96888d73a	Merge branch 'mad' of https://cgvrgit.ulno.net/kaljomad/edmunds_fanclub into mad	2025-06-14 23:58:18 +03:00
MSI\madli	09295f17e2	smol commit	2025-06-14 23:55:42 +03:00
Bmo	9ed3eea311	Merge branch 'dens' of https://cgvrgit.ulno.net/kaljomad/edmunds_fanclub into bernhards	2025-06-14 23:47:30 +03:00
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
Dens_Enrijs_Lakucs	d7784dd71e	Fixed box light	2025-06-14 23:43:06 +03:00
MSI\madli	0fdee0e537	camera sheenanigans (base of FOV)	2025-06-14 23:39:54 +03:00
Bmo	10c7e36678	Merge branch 'dens' of https://cgvrgit.ulno.net/kaljomad/edmunds_fanclub into bernhards	2025-06-14 23:27:13 +03:00
Dens_Enrijs_Lakucs	fafc1c2c4f	Light static meshes	2025-06-14 23:22:55 +03:00
MSI\madli	ceb085d1ee	different camerapicture	2025-06-14 22:58:13 +03:00
Bmo	30bd771e75	Merge branch 'dens' of https://cgvrgit.ulno.net/kaljomad/edmunds_fanclub into bernhards	2025-06-14 22:38:15 +03:00
Jonas	b2bec43012	Merge remote-tracking branch 'origin/dens' into jonas	2025-06-14 22:16:59 +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
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
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
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

106 changed files with 302 additions and 26 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Expand all files Collapse all files

BIN

Content/AdjustablePointLIght.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/AdjustableSpotLight.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/AreaAdjusterMaterial.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/CineCameraActor_Blueprint_Blueprint.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/DomLightControlSphere.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/HandMenu/BP_Menu_Hand_Modifier.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/HandMenu/BP_SelectionMenu.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/HandMenu/Base.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/HandMenu/Button.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/HandMenu/Items/BP_HandMenuItem.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/HandMenu/Items/BP_HandMenuTrash.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/HandMenu/Meshes/Base1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/HandMenu/Meshes/Button1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/HandMenu/Meshes/Button2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/HandMenu/Meshes/Button3.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/HandMenu/Meshes/Button4.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/HandMenu/Meshes/Button5.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/HandMenu/Meshes/Button6.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/HandMenu/Textures/sun-solid.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/HandMenu/Textures/trash.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/HandProximity.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/NewHapticFeedbackEffect_Curve.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/SM_HandController.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/ScanningLines.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/ScanningLinesForDomLightControlSphere.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/SceneMeshes/FirstOutput10MIL_u0_v0.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/SceneMeshes/Material_001.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/SceneMeshes/MeshRework.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/SceneMeshes/onlyfortexturedeleteme_u0_v0_diffuse.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/StageAssets/BP_Asset_Modifier.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/StageAssets/BP_DummyAsset.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/StageAssets/BP_DummyCamera.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/StageAssets/BP_DummyLight.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/StageAssets/BP_Mannequin.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/StageAssets/aiStandardSurface3.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/StageAssets/body.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/StageAssets/dress.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/StageAssets/manican.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/VRTemplate/Blueprints/GrabComponent.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/VRTemplate/Blueprints/GrabType.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/VRTemplate/Blueprints/Pistol.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/VRTemplate/Blueprints/RT_camera.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/VRTemplate/Blueprints/VRPawn.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/VRTemplate/Cameramaterial.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/VRTemplate/Haptics/GrabHapticEffect.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/VRTemplate/MI_camera.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/VRTemplate/Maps/VRTemplateMap.umap (Stored with Git LFS)

Binary file not shown.

BIN

Content/VRTemplate/Textures/T_Grid.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/WoodManequin/Barrel/barrel_basecolor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/Barrel/barrel_metal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/Barrel/barrel_norm.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/Barrel/barrel_rough.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/Barrel/m_barrel_001.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/Barrel/medieval_barrel.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/Lights/ARRI_Skypanel/ARRI_Skylight.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/Lights/ARRI_Skypanel/Base.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/Lights/ARRI_Skypanel/Base1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/Lights/ARRI_Skypanel/Chrom.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/Lights/ARRI_Skypanel/Chrom1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/Lights/ARRI_Skypanel/Chrom_001.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/Lights/ARRI_Skypanel/Chrom_0011.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/Lights/ARRI_Skypanel/Dark_Grey.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/Lights/ARRI_Skypanel/Dark_Grey1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/Lights/ARRI_Skypanel/Glass.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/Lights/ARRI_Skypanel/Glass1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/Lights/ARRI_Skypanel/Material_001.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/Lights/Box_Spot_Light/Box_Panel_Light.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/Lights/Box_Spot_Light/Box_Panel_Light_Bulb_M_Base_color.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/Lights/Box_Spot_Light/Box_Panel_Light_Metal_M_Base_color.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/Lights/Box_Spot_Light/Box_Panel_Light_Metal_M_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/Lights/Box_Spot_Light/Box_Panel_Light_Metal_M_Roughness.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/Lights/Box_Spot_Light/Flat_Panel_Light_Bulb_M.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/Lights/Box_Spot_Light/Flat_Panel_Light_Metal_M.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/Lights/StudioLight/Studio_Light.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/Lights/StudioLight/_LMP0001_Textures.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/Lights/StudioLight/_LMP0001_Textures1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/Lights/StudioLight/_LMP0001_Textures_COL_1k.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/Lights/StudioLight/_LMP0001_Textures_METL_1k.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/Lights/StudioLight/_LMP0001_Textures_NRML_1k.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/Lights/StudioLight/_LMP0001_Textures_ROUGH_1k.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/WoodManequin.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/WoodManequin_PhysicsAsset.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/WoodManequin_Poses_Sequence.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/WoodManequin_Skeleton.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/Wooden_cart/Charette_DIFF.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/Wooden_cart/Charette_NM.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/Wooden_cart/Charette_ROUGH.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/Wooden_cart/Wooden_Cart.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/Wooden_cart/wire_140088225.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/lay_figure_BaseColor_2K.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/lay_figure_Normal_2K.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/lay_figure_Roughness_2K.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/WoodManequin/lay_figure_material.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Wood_Manequin/WoodManequin.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Wood_Manequin/WoodManequinPoses.xlsx Normal file

Binary file not shown.

BIN

Content/Wood_Manequin/WoodManequin_Poses_Sequence.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Wood_Manequin/wooden-mannequin-lay-figure-rigged/textures/lay_figure_BaseColor_2K.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Wood_Manequin/wooden-mannequin-lay-figure-rigged/textures/lay_figure_BaseColor_2K.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Wood_Manequin/wooden-mannequin-lay-figure-rigged/textures/lay_figure_Emissive_4K.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Wood_Manequin/wooden-mannequin-lay-figure-rigged/textures/lay_figure_Emissive_4K.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More