59 Commits

Author SHA1 Message Date
9fae5e9ee1 last one 2025-06-15 14:24:09 +03:00
9e96a827d8 barrels and cart 2025-06-15 10:44:18 +03:00
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
49d562566c nomessages 2025-06-15 10:33:24 +03:00
fb4ec36350 better city material, better mannequin 2025-06-15 10:30:44 +03:00
842d7a6b89 finally arrived in the city 2025-06-15 09:16:13 +03:00
24d2bd2a4b Wooden cart and barrel 2025-06-15 07:47:14 +03:00
c4ce414e2c Merge branch 'mad' of https://cgvrgit.ulno.net/kaljomad/edmunds_fanclub into mad 2025-06-15 06:23:33 +03:00
1fc282707c templatemap 2025-06-15 06:20:40 +03:00
c2139fc425 Merge remote-tracking branch 'origin/bernhards' into jonas 2025-06-15 06:19:24 +03:00
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
7e35ad5a61 adding new hand menu design, added trash func 2025-06-15 04:57:29 +03:00
4511ef7aca erge remote-tracking branch 'origin/mad' into jonas 2025-06-15 04:55:18 +03:00
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
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
5415fa7079 fixed autograbbing and teleporting 2025-06-15 01:17:31 +03:00
95ac2950d3 Merge branch 'jonas' into mad 2025-06-15 00:42:10 +03:00
41d436df2a nothing special 2025-06-15 00:39:34 +03:00
eb7053729e Merge branch 'bernhards' into jonas 2025-06-15 00:31:30 +03:00
f96888d73a Merge branch 'mad' of https://cgvrgit.ulno.net/kaljomad/edmunds_fanclub into mad 2025-06-14 23:58:18 +03:00
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
05562b8bab Merge remote-tracking branch 'origin/mad' into jonas 2025-06-14 23:44:43 +03:00
33e48fe9a7 added mannequin, editing hand menu 2025-06-14 23:43:32 +03:00
d7784dd71e Fixed box light 2025-06-14 23:43:06 +03:00
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
fafc1c2c4f Light static meshes 2025-06-14 23:22:55 +03:00
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
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
0b913431e6 added mannequin 2025-06-14 21:46:03 +03:00
d5e3de7159 Merge remote-tracking branch 'origin/dens' into jonas 2025-06-14 20:09:26 +03:00
1f6ec83f30 fixed model spawn pos, added light dummy 2025-06-14 20:02:05 +03:00
e4db9ce59f made the selectionmenu finally work like desired 2025-06-14 19:34:13 +03:00
028b8b7a73 Removed unneccesary files 2025-06-14 19:27:27 +03:00
a1041365df Wood manequin 2025-06-14 19:24:21 +03:00
5d21e9cbc9 Merge branch 'mad' into jonas 2025-06-14 18:38:18 +03:00
e52c47f721 some more on camera 2025-06-14 18:37:35 +03:00
9b337f97d1 sync itemmenu onto hand 2025-06-14 18:30:16 +03:00
09fbff1e5a trying out hand menu 2025-06-14 18:15:16 +03:00
71a8290648 made the left hand big again 2025-06-14 18:04:40 +03:00