Merge branch 'master' of https://cgvrgit.ulno.net/valdisoo/VR_RageRoom

2025-04-30 12:21:27 +03:00
parent 9d2ff53501 28bd1e7325
commit 02b90e305c
207 changed files with 616 additions and 7 deletions
--- a/Config/DefaultEngine.ini
+++ b/Config/DefaultEngine.ini
@@ -102,3 +102,6 @@ ConnectionType=USBOnly
 bUseManualIPAddress=False
 ManualIPAddress=

+[/Script/UnrealEd.CookerSettings]
+bCookOnTheFlyForLaunchOn=True
+
--- a/Content/Fab/FreeFurniturePack/Blueprints/BP_Bed_Drawer.uasset
+++ b/Content/Fab/FreeFurniturePack/Blueprints/BP_Bed_Drawer.uasset
--- a/Content/Fab/FreeFurniturePack/Blueprints/BP_Classic_Commode.uasset
+++ b/Content/Fab/FreeFurniturePack/Blueprints/BP_Classic_Commode.uasset
--- a/Content/Fab/FreeFurniturePack/Blueprints/BP_Classic_Commode_2.uasset
+++ b/Content/Fab/FreeFurniturePack/Blueprints/BP_Classic_Commode_2.uasset
--- a/Content/Fab/FreeFurniturePack/Blueprints/BP_Classic_Cupboard.uasset
+++ b/Content/Fab/FreeFurniturePack/Blueprints/BP_Classic_Cupboard.uasset
--- a/Content/Fab/FreeFurniturePack/Blueprints/BP_Modern_Cupboard.uasset
+++ b/Content/Fab/FreeFurniturePack/Blueprints/BP_Modern_Cupboard.uasset
--- a/Content/Fab/FreeFurniturePack/Maps/Overview.umap
+++ b/Content/Fab/FreeFurniturePack/Maps/Overview.umap
--- a/Content/Fab/FreeFurniturePack/Materials/MI_Modern_Armchair.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/MI_Modern_Armchair.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/MI_Modern_Armchair_Pillows.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/MI_Modern_Armchair_Pillows.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/MI_Modern_Bed.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/MI_Modern_Bed.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/MI_Modern_Bed_Pillows.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/MI_Modern_Bed_Pillows.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/MI_Modern_Bed_Table.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/MI_Modern_Bed_Table.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/MI_Modern_Chair_1.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/MI_Modern_Chair_1.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/MI_Modern_Sofa_1.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/MI_Modern_Sofa_1.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/MI_Modern_Sofa_2.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/MI_Modern_Sofa_2.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/MM_Armchair.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/MM_Armchair.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/MM_Modern_Bed.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/MM_Modern_Bed.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/MM_Modern_Bed_pillows.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/MM_Modern_Bed_pillows.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/MM_Modern_Sofa.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/MM_Modern_Sofa.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/MM_Tables_and_Chairs.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/MM_Tables_and_Chairs.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_Art_2.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_Art_2.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_Bathtub.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_Bathtub.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_Bed_Lamp_1.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_Bed_Lamp_1.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_Bed_Lamp_2.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_Bed_Lamp_2.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_Bed_Lamp_3.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_Bed_Lamp_3.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_Bed_Lamp_Glowing_Part.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_Bed_Lamp_Glowing_Part.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_Bed_drawer_metall.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_Bed_drawer_metall.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_Bed_drawer_plastic.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_Bed_drawer_plastic.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_Chrome.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_Chrome.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_Classic_Commode.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_Classic_Commode.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_Classic_Cupboard.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_Classic_Cupboard.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_Classic_Leather_armchair.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_Classic_Leather_armchair.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_Classic_Leather_sofa.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_Classic_Leather_sofa.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_Classic_Leather_sofa_2.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_Classic_Leather_sofa_2.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_Classic_Picture.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_Classic_Picture.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_Classic_chair.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_Classic_chair.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_Classic_table.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_Classic_table.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_Coffee_Table.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_Coffee_Table.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_Commode.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_Commode.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_Cupboard_Metall.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_Cupboard_Metall.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_Elegant_chair.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_Elegant_chair.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_Metall.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_Metall.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_Military_Bed.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_Military_Bed.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_Military_Bed_Grid.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_Military_Bed_Grid.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_Military_Bed_Matress.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_Military_Bed_Matress.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_Military_Bed_Matress_with_Blanket.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_Military_Bed_Matress_with_Blanket.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_Modern_Bed_2.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_Modern_Bed_2.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_Modern_Cupboard.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_Modern_Cupboard.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_Modern_Table_bottom.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_Modern_Table_bottom.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_Modern_Table_top.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_Modern_Table_top.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_Office_Chair.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_Office_Chair.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_Old_Chair.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_Old_Chair.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_Old_Table.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_Old_Table.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_Picture.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_Picture.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_Picture_frame.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_Picture_frame.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_Round_table.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_Round_table.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_TV.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_TV.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/M_Toilet.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/M_Toilet.uasset
--- a/Content/Fab/FreeFurniturePack/Materials/T_Table_Lamp.uasset
+++ b/Content/Fab/FreeFurniturePack/Materials/T_Table_Lamp.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Bathtub.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Bathtub.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Bed_Drawer.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Bed_Drawer.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Bed_Drawer_Openable_Part.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Bed_Drawer_Openable_Part.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Bed_Lamp_1.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Bed_Lamp_1.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Bed_Lamp_2.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Bed_Lamp_2.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Bed_Table.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Bed_Table.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Bed_lamp_3.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Bed_lamp_3.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Classic_Commode.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Classic_Commode.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Classic_Commode_2.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Classic_Commode_2.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Classic_Commode_Drawer_1.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Classic_Commode_Drawer_1.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Classic_Commode_Drawer_2.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Classic_Commode_Drawer_2.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Classic_Cupboard.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Classic_Cupboard.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Classic_Cupboard_Door_Left.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Classic_Cupboard_Door_Left.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Classic_Cupboard_Door_Right.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Classic_Cupboard_Door_Right.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Classic_Cupboard_Drawer.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Classic_Cupboard_Drawer.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Classic_Leather_Armchair.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Classic_Leather_Armchair.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Classic_Leather_Sofa.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Classic_Leather_Sofa.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Classic_Leather_sofa_2.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Classic_Leather_sofa_2.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Classic_Picture.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Classic_Picture.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Classic_Round_Table.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Classic_Round_Table.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Classic_chair.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Classic_chair.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Classic_table.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Classic_table.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Coffee_Table.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Coffee_Table.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Commode.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Commode.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Elegant_chair.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Elegant_chair.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Elegant_chair_ottoman.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Elegant_chair_ottoman.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Military_Bed.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Military_Bed.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Military_Bed_2.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Military_Bed_2.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Modern_Armchair.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Modern_Armchair.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Modern_Bed_1.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Modern_Bed_1.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Modern_Bed_2.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Modern_Bed_2.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Modern_Chair_1.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Modern_Chair_1.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Modern_Cupboard.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Modern_Cupboard.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Modern_Cupboard_Sliding_Door.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Modern_Cupboard_Sliding_Door.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Modern_Office_chair.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Modern_Office_chair.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Modern_Sofa_1.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Modern_Sofa_1.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Modern_Sofa_2.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Modern_Sofa_2.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Modern_Table.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Modern_Table.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Old_Chair.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Old_Chair.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Old_Table.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Old_Table.uasset
--- a/Content/Fab/FreeFurniturePack/Meshes/SM_Picture.uasset
+++ b/Content/Fab/FreeFurniturePack/Meshes/SM_Picture.uasset
--- a/Show More
+++ b/Show More