kaljomad/edmunds_fanclub
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: kaljomad:1f6ec83f302fa31c43ae15e4ef654718e32160d8
Branches Tags
kaljomad:master kaljomad:mad kaljomad:dens kaljomad:jonas kaljomad:bernhards
..
compare: kaljomad:mad
Branches Tags
kaljomad:mad kaljomad:dens kaljomad:jonas kaljomad:bernhards kaljomad:master

43 Commits
1f6ec83f30 ... 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
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
97 changed files with 276 additions and 24 deletions
Expand all files Collapse all files

BIN
Content/AdjustablePointLIght.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/AdjustableSpotLight.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/AreaAdjusterMaterial.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/CineCameraActor_Blueprint_Blueprint.uasset LFS
View File

Binary file not shown.

BIN
Content/DomLightControlSphere.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/HandMenu/BP_Menu_Hand_Modifier.uasset LFS
View File

Binary file not shown.

BIN
Content/HandMenu/BP_SelectionMenu.uasset LFS
View File

Binary file not shown.

BIN
Content/HandMenu/Base.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/HandMenu/Button.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/HandMenu/Items/BP_HandMenuItem.uasset LFS
View File

Binary file not shown.

BIN
Content/HandMenu/Items/BP_HandMenuTrash.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/HandMenu/Meshes/Base1.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/HandMenu/Meshes/Button1.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/HandMenu/Meshes/Button2.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/HandMenu/Meshes/Button3.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/HandMenu/Meshes/Button4.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/HandMenu/Meshes/Button5.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/HandMenu/Meshes/Button6.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/HandMenu/Textures/sun-solid.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/HandMenu/Textures/trash.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/HandProximity.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/NewHapticFeedbackEffect_Curve.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/SM_HandController.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/ScanningLines.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/ScanningLinesForDomLightControlSphere.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/SceneMeshes/FirstOutput10MIL_u0_v0.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/SceneMeshes/Material_001.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/SceneMeshes/MeshRework.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/SceneMeshes/onlyfortexturedeleteme_u0_v0_diffuse.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/StageAssets/BP_Mannequin.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/VRTemplate/Blueprints/GrabComponent.uasset LFS
View File

Binary file not shown.

BIN
Content/VRTemplate/Blueprints/GrabType.uasset LFS
View File

Binary file not shown.

BIN
Content/VRTemplate/Blueprints/RT_camera.uasset LFS
View File

Binary file not shown.

BIN
Content/VRTemplate/Blueprints/VRPawn.uasset LFS
View File

Binary file not shown.

BIN
Content/VRTemplate/Cameramaterial.uasset LFS
View File

Binary file not shown.

BIN
Content/VRTemplate/Haptics/GrabHapticEffect.uasset LFS
View File

Binary file not shown.

BIN
Content/VRTemplate/MI_camera.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/VRTemplate/Maps/VRTemplateMap.umap LFS
View File

Binary file not shown.

BIN
Content/VRTemplate/Textures/T_Grid.uasset LFS
View File

Binary file not shown.

BIN
Content/WoodManequin/Barrel/barrel_basecolor.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/Barrel/barrel_metal.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/Barrel/barrel_norm.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/Barrel/barrel_rough.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/Barrel/m_barrel_001.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/Barrel/medieval_barrel.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/Lights/ARRI_Skypanel/ARRI_Skylight.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/Lights/ARRI_Skypanel/Base.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/Lights/ARRI_Skypanel/Base1.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/Lights/ARRI_Skypanel/Chrom.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/Lights/ARRI_Skypanel/Chrom1.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/Lights/ARRI_Skypanel/Chrom_001.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/Lights/ARRI_Skypanel/Chrom_0011.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/Lights/ARRI_Skypanel/Dark_Grey.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/Lights/ARRI_Skypanel/Dark_Grey1.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/Lights/ARRI_Skypanel/Glass.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/Lights/ARRI_Skypanel/Glass1.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/Lights/ARRI_Skypanel/Material_001.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/Lights/Box_Spot_Light/Box_Panel_Light.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/Lights/Box_Spot_Light/Box_Panel_Light_Bulb_M_Base_color.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/Lights/Box_Spot_Light/Box_Panel_Light_Metal_M_Base_color.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/Lights/Box_Spot_Light/Box_Panel_Light_Metal_M_Normal.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/Lights/Box_Spot_Light/Box_Panel_Light_Metal_M_Roughness.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/Lights/Box_Spot_Light/Flat_Panel_Light_Bulb_M.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/Lights/Box_Spot_Light/Flat_Panel_Light_Metal_M.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/Lights/StudioLight/Studio_Light.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/Lights/StudioLight/_LMP0001_Textures.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/Lights/StudioLight/_LMP0001_Textures1.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/Lights/StudioLight/_LMP0001_Textures_COL_1k.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/Lights/StudioLight/_LMP0001_Textures_METL_1k.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/Lights/StudioLight/_LMP0001_Textures_NRML_1k.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/Lights/StudioLight/_LMP0001_Textures_ROUGH_1k.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/WoodManequin.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/WoodManequin_PhysicsAsset.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/WoodManequin_Poses_Sequence.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/WoodManequin_Skeleton.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/Wooden_cart/Charette_DIFF.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/Wooden_cart/Charette_NM.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/Wooden_cart/Charette_ROUGH.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/Wooden_cart/Wooden_Cart.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/Wooden_cart/wire_140088225.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/lay_figure_BaseColor_2K.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/lay_figure_Normal_2K.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/lay_figure_Roughness_2K.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/WoodManequin/lay_figure_material.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/Wood_Manequin/WoodManequin.fbx LFS Normal file
View File

Binary file not shown.

BIN
Content/Wood_Manequin/WoodManequinPoses.xlsx Normal file
View File

Binary file not shown.

BIN
Content/Wood_Manequin/WoodManequin_Poses_Sequence.fbx LFS Normal file
View File

Binary file not shown.

BIN
Content/Wood_Manequin/wooden-mannequin-lay-figure-rigged/textures/lay_figure_BaseColor_2K.png LFS Normal file
View File

Binary file not shown.

BIN
Content/Wood_Manequin/wooden-mannequin-lay-figure-rigged/textures/lay_figure_BaseColor_2K.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/Wood_Manequin/wooden-mannequin-lay-figure-rigged/textures/lay_figure_Emissive_4K.png LFS Normal file
View File

Binary file not shown.

BIN
Content/Wood_Manequin/wooden-mannequin-lay-figure-rigged/textures/lay_figure_Emissive_4K.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/Wood_Manequin/wooden-mannequin-lay-figure-rigged/textures/lay_figure_Metallic_4K.png LFS Normal file
View File

Binary file not shown.

BIN
Content/Wood_Manequin/wooden-mannequin-lay-figure-rigged/textures/lay_figure_Metallic_4K.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/Wood_Manequin/wooden-mannequin-lay-figure-rigged/textures/lay_figure_Normal_2K.png LFS Normal file
View File

Binary file not shown.

BIN
Content/Wood_Manequin/wooden-mannequin-lay-figure-rigged/textures/lay_figure_Normal_2K.uasset LFS Normal file
View File

Binary file not shown.

BIN
Content/Wood_Manequin/wooden-mannequin-lay-figure-rigged/textures/lay_figure_Roughness_4K.png LFS Normal file
View File

Binary file not shown.

BIN
Content/Wood_Manequin/wooden-mannequin-lay-figure-rigged/textures/lay_figure_Roughness_4K.uasset LFS Normal file
View File

Binary file not shown.