diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index bf5169fe4..ed38ca9dc 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -79,3 +79,60 @@ r.FidelityFX.FSR2.UseNativeVulkan=True [/Script/WindowsTargetPlatform.WindowsTargetSettings] DefaultGraphicsRHI=DefaultGraphicsRHI_DX12 +[/Script/Engine.CollisionProfile] +-Profiles=(Name="NoCollision",CollisionEnabled=NoCollision,ObjectTypeName="WorldStatic",CustomResponses=((Channel="Visibility",Response=ECR_Ignore),(Channel="Camera",Response=ECR_Ignore)),HelpMessage="No collision",bCanModify=False) +-Profiles=(Name="BlockAll",CollisionEnabled=QueryAndPhysics,ObjectTypeName="WorldStatic",CustomResponses=,HelpMessage="WorldStatic object that blocks all actors by default. All new custom channels will use its own default response. ",bCanModify=False) +-Profiles=(Name="OverlapAll",CollisionEnabled=QueryOnly,ObjectTypeName="WorldStatic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility",Response=ECR_Overlap),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldStatic object that overlaps all actors by default. All new custom channels will use its own default response. ",bCanModify=False) +-Profiles=(Name="BlockAllDynamic",CollisionEnabled=QueryAndPhysics,ObjectTypeName="WorldDynamic",CustomResponses=,HelpMessage="WorldDynamic object that blocks all actors by default. All new custom channels will use its own default response. ",bCanModify=False) +-Profiles=(Name="OverlapAllDynamic",CollisionEnabled=QueryOnly,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility",Response=ECR_Overlap),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldDynamic object that overlaps all actors by default. All new custom channels will use its own default response. ",bCanModify=False) +-Profiles=(Name="IgnoreOnlyPawn",CollisionEnabled=QueryOnly,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="Pawn",Response=ECR_Ignore),(Channel="Vehicle",Response=ECR_Ignore)),HelpMessage="WorldDynamic object that ignores Pawn and Vehicle. All other channels will be set to default.",bCanModify=False) +-Profiles=(Name="OverlapOnlyPawn",CollisionEnabled=QueryOnly,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="Pawn",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Ignore)),HelpMessage="WorldDynamic object that overlaps Pawn, Camera, and Vehicle. All other channels will be set to default. ",bCanModify=False) +-Profiles=(Name="Pawn",CollisionEnabled=QueryAndPhysics,ObjectTypeName="Pawn",CustomResponses=((Channel="Visibility",Response=ECR_Ignore)),HelpMessage="Pawn object. Can be used for capsule of any playerable character or AI. ",bCanModify=False) +-Profiles=(Name="Spectator",CollisionEnabled=QueryOnly,ObjectTypeName="Pawn",CustomResponses=((Channel="WorldStatic",Response=ECR_Block),(Channel="Pawn",Response=ECR_Ignore),(Channel="Visibility",Response=ECR_Ignore),(Channel="WorldDynamic",Response=ECR_Ignore),(Channel="Camera",Response=ECR_Ignore),(Channel="PhysicsBody",Response=ECR_Ignore),(Channel="Vehicle",Response=ECR_Ignore),(Channel="Destructible",Response=ECR_Ignore)),HelpMessage="Pawn object that ignores all other actors except WorldStatic.",bCanModify=False) +-Profiles=(Name="CharacterMesh",CollisionEnabled=QueryOnly,ObjectTypeName="Pawn",CustomResponses=((Channel="Pawn",Response=ECR_Ignore),(Channel="Vehicle",Response=ECR_Ignore),(Channel="Visibility",Response=ECR_Ignore)),HelpMessage="Pawn object that is used for Character Mesh. All other channels will be set to default.",bCanModify=False) +-Profiles=(Name="PhysicsActor",CollisionEnabled=QueryAndPhysics,ObjectTypeName="PhysicsBody",CustomResponses=,HelpMessage="Simulating actors",bCanModify=False) +-Profiles=(Name="Destructible",CollisionEnabled=QueryAndPhysics,ObjectTypeName="Destructible",CustomResponses=,HelpMessage="Destructible actors",bCanModify=False) +-Profiles=(Name="InvisibleWall",CollisionEnabled=QueryAndPhysics,ObjectTypeName="WorldStatic",CustomResponses=((Channel="Visibility",Response=ECR_Ignore)),HelpMessage="WorldStatic object that is invisible.",bCanModify=False) +-Profiles=(Name="InvisibleWallDynamic",CollisionEnabled=QueryAndPhysics,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="Visibility",Response=ECR_Ignore)),HelpMessage="WorldDynamic object that is invisible.",bCanModify=False) +-Profiles=(Name="Trigger",CollisionEnabled=QueryOnly,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility",Response=ECR_Ignore),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldDynamic object that is used for trigger. All other channels will be set to default.",bCanModify=False) +-Profiles=(Name="Ragdoll",CollisionEnabled=QueryAndPhysics,ObjectTypeName="PhysicsBody",CustomResponses=((Channel="Pawn",Response=ECR_Ignore),(Channel="Visibility",Response=ECR_Ignore)),HelpMessage="Simulating Skeletal Mesh Component. All other channels will be set to default.",bCanModify=False) +-Profiles=(Name="Vehicle",CollisionEnabled=QueryAndPhysics,ObjectTypeName="Vehicle",CustomResponses=,HelpMessage="Vehicle object that blocks Vehicle, WorldStatic, and WorldDynamic. All other channels will be set to default.",bCanModify=False) +-Profiles=(Name="UI",CollisionEnabled=QueryOnly,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility",Response=ECR_Block),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldStatic object that overlaps all actors by default. All new custom channels will use its own default response. ",bCanModify=False) ++Profiles=(Name="NoCollision",CollisionEnabled=NoCollision,bCanModify=False,ObjectTypeName="WorldStatic",CustomResponses=((Channel="Visibility",Response=ECR_Ignore),(Channel="Camera",Response=ECR_Ignore)),HelpMessage="No collision") ++Profiles=(Name="BlockAll",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="WorldStatic",CustomResponses=,HelpMessage="WorldStatic object that blocks all actors by default. All new custom channels will use its own default response. ") ++Profiles=(Name="OverlapAll",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="WorldStatic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility",Response=ECR_Overlap),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldStatic object that overlaps all actors by default. All new custom channels will use its own default response. ") ++Profiles=(Name="BlockAllDynamic",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=,HelpMessage="WorldDynamic object that blocks all actors by default. All new custom channels will use its own default response. ") ++Profiles=(Name="OverlapAllDynamic",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility",Response=ECR_Overlap),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldDynamic object that overlaps all actors by default. All new custom channels will use its own default response. ") ++Profiles=(Name="IgnoreOnlyPawn",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="Pawn",Response=ECR_Ignore),(Channel="Vehicle",Response=ECR_Ignore)),HelpMessage="WorldDynamic object that ignores Pawn and Vehicle. All other channels will be set to default.") ++Profiles=(Name="OverlapOnlyPawn",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="Pawn",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Ignore)),HelpMessage="WorldDynamic object that overlaps Pawn, Camera, and Vehicle. All other channels will be set to default. ") ++Profiles=(Name="Pawn",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="Pawn",CustomResponses=((Channel="Visibility",Response=ECR_Ignore)),HelpMessage="Pawn object. Can be used for capsule of any playerable character or AI. ") ++Profiles=(Name="Spectator",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="Pawn",CustomResponses=((Channel="WorldStatic"),(Channel="Pawn",Response=ECR_Ignore),(Channel="Visibility",Response=ECR_Ignore),(Channel="WorldDynamic",Response=ECR_Ignore),(Channel="Camera",Response=ECR_Ignore),(Channel="PhysicsBody",Response=ECR_Ignore),(Channel="Vehicle",Response=ECR_Ignore),(Channel="Destructible",Response=ECR_Ignore)),HelpMessage="Pawn object that ignores all other actors except WorldStatic.") ++Profiles=(Name="CharacterMesh",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="Pawn",CustomResponses=((Channel="Pawn",Response=ECR_Ignore),(Channel="Vehicle",Response=ECR_Ignore),(Channel="Visibility",Response=ECR_Ignore)),HelpMessage="Pawn object that is used for Character Mesh. All other channels will be set to default.") ++Profiles=(Name="PhysicsActor",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="PhysicsBody",CustomResponses=,HelpMessage="Simulating actors") ++Profiles=(Name="Destructible",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="Destructible",CustomResponses=,HelpMessage="Destructible actors") ++Profiles=(Name="InvisibleWall",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="WorldStatic",CustomResponses=((Channel="Visibility",Response=ECR_Ignore)),HelpMessage="WorldStatic object that is invisible.") ++Profiles=(Name="InvisibleWallDynamic",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="Visibility",Response=ECR_Ignore)),HelpMessage="WorldDynamic object that is invisible.") ++Profiles=(Name="Trigger",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility",Response=ECR_Ignore),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldDynamic object that is used for trigger. All other channels will be set to default.") ++Profiles=(Name="Ragdoll",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="PhysicsBody",CustomResponses=((Channel="Pawn",Response=ECR_Ignore),(Channel="Visibility",Response=ECR_Ignore)),HelpMessage="Simulating Skeletal Mesh Component. All other channels will be set to default.") ++Profiles=(Name="Vehicle",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="Vehicle",CustomResponses=,HelpMessage="Vehicle object that blocks Vehicle, WorldStatic, and WorldDynamic. All other channels will be set to default.") ++Profiles=(Name="UI",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility"),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldStatic object that overlaps all actors by default. All new custom channels will use its own default response. ") ++EditProfiles=(Name="Trigger",CustomResponses=((Channel="Camera",Response=ECR_Ignore))) +-ProfileRedirects=(OldName="BlockingVolume",NewName="InvisibleWall") +-ProfileRedirects=(OldName="InterpActor",NewName="IgnoreOnlyPawn") +-ProfileRedirects=(OldName="StaticMeshComponent",NewName="BlockAllDynamic") +-ProfileRedirects=(OldName="SkeletalMeshActor",NewName="PhysicsActor") +-ProfileRedirects=(OldName="InvisibleActor",NewName="InvisibleWallDynamic") ++ProfileRedirects=(OldName="BlockingVolume",NewName="InvisibleWall") ++ProfileRedirects=(OldName="InterpActor",NewName="IgnoreOnlyPawn") ++ProfileRedirects=(OldName="StaticMeshComponent",NewName="BlockAllDynamic") ++ProfileRedirects=(OldName="SkeletalMeshActor",NewName="PhysicsActor") ++ProfileRedirects=(OldName="InvisibleActor",NewName="InvisibleWallDynamic") +-CollisionChannelRedirects=(OldName="Static",NewName="WorldStatic") +-CollisionChannelRedirects=(OldName="Dynamic",NewName="WorldDynamic") +-CollisionChannelRedirects=(OldName="VehicleMovement",NewName="Vehicle") +-CollisionChannelRedirects=(OldName="PawnMovement",NewName="Pawn") ++CollisionChannelRedirects=(OldName="Static",NewName="WorldStatic") ++CollisionChannelRedirects=(OldName="Dynamic",NewName="WorldDynamic") ++CollisionChannelRedirects=(OldName="VehicleMovement",NewName="Vehicle") ++CollisionChannelRedirects=(OldName="PawnMovement",NewName="Pawn") + diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index 475a53591..0eb42e48f 100644 --- a/Config/DefaultInput.ini +++ b/Config/DefaultInput.ini @@ -104,28 +104,6 @@ DoubleClickTime=0.200000 +AxisMappings=(AxisName="forward",Scale=-1.000000,Key=Down) +AxisMappings=(AxisName="forward",Scale=1.000000,Key=W) +AxisMappings=(AxisName="forward",Scale=-1.000000,Key=S) -+AxisMappings=(AxisName="R_VRtrigger",Scale=1.000000,Key=OculusTouch_Right_Trigger_Axis) -+AxisMappings=(AxisName="R_VRtrigger",Scale=1.000000,Key=Vive_Right_Trigger_Axis) -+AxisMappings=(AxisName="R_VRstickX",Scale=1.000000,Key=OculusTouch_Right_Thumbstick_Y) -+AxisMappings=(AxisName="R_VRstickY",Scale=1.000000,Key=OculusTouch_Left_Thumbstick_X) -+AxisMappings=(AxisName="R_VRgrabber",Scale=1.000000,Key=OculusTouch_Right_Grip_Axis) -+AxisMappings=(AxisName="R_VRtrigger",Scale=1.000000,Key=Cosmos_Right_Trigger_Axis) -+AxisMappings=(AxisName="R_VRstickX",Scale=1.000000,Key=Cosmos_Right_Thumbstick_Y) -+AxisMappings=(AxisName="R_VRstickY",Scale=1.000000,Key=Cosmos_Right_Thumbstick_X) -+AxisMappings=(AxisName="R_VRgrabber",Scale=1.000000,Key=Cosmos_Right_Grip_Axis) -+AxisMappings=(AxisName="L_VRtrigger",Scale=1.000000,Key=OculusTouch_Left_Trigger_Axis) -+AxisMappings=(AxisName="L_VRtrigger",Scale=1.000000,Key=Vive_Left_Trigger_Axis) -+AxisMappings=(AxisName="L_VRstickX",Scale=1.000000,Key=OculusTouch_Left_Thumbstick_X) -+AxisMappings=(AxisName="L_VRstickY",Scale=1.000000,Key=OculusTouch_Left_Thumbstick_Y) -+AxisMappings=(AxisName="L_VRgrabber",Scale=1.000000,Key=OculusTouch_Left_Grip_Axis) -+AxisMappings=(AxisName="L_VRtrigger",Scale=1.000000,Key=Cosmos_Left_Trigger_Axis) -+AxisMappings=(AxisName="L_VRstickX",Scale=1.000000,Key=Cosmos_Left_Thumbstick_Y) -+AxisMappings=(AxisName="L_VRstickY",Scale=1.000000,Key=Cosmos_Left_Thumbstick_X) -+AxisMappings=(AxisName="L_VRgrabber",Scale=1.000000,Key=Cosmos_Left_Grip_Axis) -+AxisMappings=(AxisName="R_btn1",Scale=1.000000,Key=OculusTouch_Right_A_Click) -+AxisMappings=(AxisName="R_btn2",Scale=1.000000,Key=OculusTouch_Right_B_Click) -+AxisMappings=(AxisName="L_btn1",Scale=1.000000,Key=OculusTouch_Left_X_Click) -+AxisMappings=(AxisName="L_btn2",Scale=1.000000,Key=OculusTouch_Left_Y_Click) DefaultPlayerInputClass=/Script/Engine.PlayerInput DefaultInputComponentClass=/Script/Engine.InputComponent DefaultTouchInterface=None diff --git a/Content/Assetpacks/CarMoveSpline/BP/BP_CarAI.uasset b/Content/Assetpacks/CarMoveSpline/BP/BP_CarAI.uasset index fe7003642..dce491b83 100644 Binary files a/Content/Assetpacks/CarMoveSpline/BP/BP_CarAI.uasset and b/Content/Assetpacks/CarMoveSpline/BP/BP_CarAI.uasset differ diff --git a/Content/Assetpacks/CarMoveSpline/BP/BP_CarSpline.uasset b/Content/Assetpacks/CarMoveSpline/BP/BP_CarSpline.uasset index 66d226d6f..934306b62 100644 Binary files a/Content/Assetpacks/CarMoveSpline/BP/BP_CarSpline.uasset and b/Content/Assetpacks/CarMoveSpline/BP/BP_CarSpline.uasset differ diff --git a/Content/Assetpacks/CarMoveSpline/BP/carAI/carAIController.uasset b/Content/Assetpacks/CarMoveSpline/BP/carAI/carAIController.uasset index 09c8da8c2..73e5de762 100644 Binary files a/Content/Assetpacks/CarMoveSpline/BP/carAI/carAIController.uasset and b/Content/Assetpacks/CarMoveSpline/BP/carAI/carAIController.uasset differ diff --git a/Content/Assetpacks/ModularCity/Material/instancied_Mat/GreenLight.uasset b/Content/Assetpacks/ModularCity/Material/instancied_Mat/GreenLight.uasset index 3b2060211..dc1053166 100644 Binary files a/Content/Assetpacks/ModularCity/Material/instancied_Mat/GreenLight.uasset and b/Content/Assetpacks/ModularCity/Material/instancied_Mat/GreenLight.uasset differ diff --git a/Content/Assetpacks/ModularCity/Meshes/Road_Props/Traffic_Light_One_Side_Var2.uasset b/Content/Assetpacks/ModularCity/Meshes/Road_Props/Traffic_Light_One_Side_Var2.uasset index 2311cf98c..5a787723f 100644 Binary files a/Content/Assetpacks/ModularCity/Meshes/Road_Props/Traffic_Light_One_Side_Var2.uasset and b/Content/Assetpacks/ModularCity/Meshes/Road_Props/Traffic_Light_One_Side_Var2.uasset differ diff --git a/Content/Blueprints/Player/GI.uasset b/Content/Blueprints/Player/GI.uasset index d0714951f..62dc24bc8 100644 Binary files a/Content/Blueprints/Player/GI.uasset and b/Content/Blueprints/Player/GI.uasset differ diff --git a/Content/Blueprints/Player/MyPC.uasset b/Content/Blueprints/Player/MyPC.uasset index cac499ac0..16c037667 100644 Binary files a/Content/Blueprints/Player/MyPC.uasset and b/Content/Blueprints/Player/MyPC.uasset differ diff --git a/Content/Blueprints/Player/WalkingPawn.uasset b/Content/Blueprints/Player/WalkingPawn.uasset index 9788c3f12..6759d4e2c 100644 Binary files a/Content/Blueprints/Player/WalkingPawn.uasset and b/Content/Blueprints/Player/WalkingPawn.uasset differ diff --git a/Content/Blueprints/UI/Actors/FlatPoint.uasset b/Content/Blueprints/UI/Actors/FlatPoint.uasset index e78daef92..3bd729c98 100644 Binary files a/Content/Blueprints/UI/Actors/FlatPoint.uasset and b/Content/Blueprints/UI/Actors/FlatPoint.uasset differ diff --git a/Content/Blueprints/UI/Actors/TouchPoint.uasset b/Content/Blueprints/UI/Actors/TouchPoint.uasset index 084300594..b4b83a943 100644 Binary files a/Content/Blueprints/UI/Actors/TouchPoint.uasset and b/Content/Blueprints/UI/Actors/TouchPoint.uasset differ diff --git a/Content/Blueprints/UI/Imgs/Theatre.uasset b/Content/Blueprints/UI/Imgs/Theatre.uasset new file mode 100644 index 000000000..ff733e63e Binary files /dev/null and b/Content/Blueprints/UI/Imgs/Theatre.uasset differ diff --git a/Content/Blueprints/UI/Imgs/VRPoint/Property.uasset b/Content/Blueprints/UI/Imgs/VRPoint/Property.uasset new file mode 100644 index 000000000..b1a6878bb Binary files /dev/null and b/Content/Blueprints/UI/Imgs/VRPoint/Property.uasset differ diff --git a/Content/Blueprints/UI/Imgs/VRPoint/Property1.uasset b/Content/Blueprints/UI/Imgs/VRPoint/Property1.uasset new file mode 100644 index 000000000..efb54ead3 Binary files /dev/null and b/Content/Blueprints/UI/Imgs/VRPoint/Property1.uasset differ diff --git a/Content/Blueprints/UI/Materials/M_cap.uasset b/Content/Blueprints/UI/Materials/M_cap.uasset index 7a400d5d3..955c32772 100644 Binary files a/Content/Blueprints/UI/Materials/M_cap.uasset and b/Content/Blueprints/UI/Materials/M_cap.uasset differ diff --git a/Content/Blueprints/UI/Materials/M_cap_default.uasset b/Content/Blueprints/UI/Materials/M_cap_default.uasset index 6653a13e2..157f35c55 100644 Binary files a/Content/Blueprints/UI/Materials/M_cap_default.uasset and b/Content/Blueprints/UI/Materials/M_cap_default.uasset differ diff --git a/Content/Blueprints/UI/Materials/MeshChangeEmis.uasset b/Content/Blueprints/UI/Materials/MeshChangeEmis.uasset deleted file mode 100644 index 3d7e74a31..000000000 Binary files a/Content/Blueprints/UI/Materials/MeshChangeEmis.uasset and /dev/null differ diff --git a/Content/Blueprints/UI/Materials/MovePoint.uasset b/Content/Blueprints/UI/Materials/MovePoint.uasset index df091a230..009c87252 100644 Binary files a/Content/Blueprints/UI/Materials/MovePoint.uasset and b/Content/Blueprints/UI/Materials/MovePoint.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Elements/chBox.uasset b/Content/Blueprints/UI/WBPS/Elements/chBox.uasset index 1e3917942..515bad4c3 100644 Binary files a/Content/Blueprints/UI/WBPS/Elements/chBox.uasset and b/Content/Blueprints/UI/WBPS/Elements/chBox.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Elements/slider.uasset b/Content/Blueprints/UI/WBPS/Elements/slider.uasset index ca4400a59..f3b6c5c77 100644 Binary files a/Content/Blueprints/UI/WBPS/Elements/slider.uasset and b/Content/Blueprints/UI/WBPS/Elements/slider.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/InfoPanel.uasset b/Content/Blueprints/UI/WBPS/Menu/InfoPanel.uasset index 1e9034da7..4e77ea376 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/InfoPanel.uasset and b/Content/Blueprints/UI/WBPS/Menu/InfoPanel.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/aboutInfra.uasset b/Content/Blueprints/UI/WBPS/Menu/aboutInfra.uasset new file mode 100644 index 000000000..63bc51680 Binary files /dev/null and b/Content/Blueprints/UI/WBPS/Menu/aboutInfra.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/floorInfo.uasset b/Content/Blueprints/UI/WBPS/Menu/floorInfo.uasset index be22383b4..5750a979e 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/floorInfo.uasset and b/Content/Blueprints/UI/WBPS/Menu/floorInfo.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/houseInfo.uasset b/Content/Blueprints/UI/WBPS/Menu/houseInfo.uasset index 0562e5984..eee611787 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/houseInfo.uasset and b/Content/Blueprints/UI/WBPS/Menu/houseInfo.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/infraPanel.uasset b/Content/Blueprints/UI/WBPS/Menu/infraPanel.uasset index de03dfb06..8e398579c 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/infraPanel.uasset and b/Content/Blueprints/UI/WBPS/Menu/infraPanel.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/selectFloorElev.uasset b/Content/Blueprints/UI/WBPS/Menu/selectFloorElev.uasset index 49e8ed428..f496ad25e 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/selectFloorElev.uasset and b/Content/Blueprints/UI/WBPS/Menu/selectFloorElev.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/sessionEnd.uasset b/Content/Blueprints/UI/WBPS/Menu/sessionEnd.uasset index 8839ae882..03809f74b 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/sessionEnd.uasset and b/Content/Blueprints/UI/WBPS/Menu/sessionEnd.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/settings.uasset b/Content/Blueprints/UI/WBPS/Menu/settings.uasset index 478751031..b18927d9c 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/settings.uasset and b/Content/Blueprints/UI/WBPS/Menu/settings.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/timePanel.uasset b/Content/Blueprints/UI/WBPS/Menu/timePanel.uasset index ee9c61bcd..d73b095a2 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/timePanel.uasset and b/Content/Blueprints/UI/WBPS/Menu/timePanel.uasset differ diff --git a/Content/Blueprints/UI/WBPS/filter/Filter.uasset b/Content/Blueprints/UI/WBPS/filter/Filter.uasset index c92298378..c247d36e2 100644 Binary files a/Content/Blueprints/UI/WBPS/filter/Filter.uasset and b/Content/Blueprints/UI/WBPS/filter/Filter.uasset differ diff --git a/Content/Blueprints/UI/WBPS/filter/favoritesWin.uasset b/Content/Blueprints/UI/WBPS/filter/favoritesWin.uasset index 97e9ad306..a3cb9df9e 100644 Binary files a/Content/Blueprints/UI/WBPS/filter/favoritesWin.uasset and b/Content/Blueprints/UI/WBPS/filter/favoritesWin.uasset differ diff --git a/Content/Blueprints/Utils/Generators/HumanAI/findPlace.uasset b/Content/Blueprints/Utils/Generators/HumanAI/findPlace.uasset index 7ec875698..44f8cc4e7 100644 Binary files a/Content/Blueprints/Utils/Generators/HumanAI/findPlace.uasset and b/Content/Blueprints/Utils/Generators/HumanAI/findPlace.uasset differ diff --git a/Content/Blueprints/Utils/Generators/HumanAI/findSplineToWalk.uasset b/Content/Blueprints/Utils/Generators/HumanAI/findSplineToWalk.uasset index 20339baac..db65d0e89 100644 Binary files a/Content/Blueprints/Utils/Generators/HumanAI/findSplineToWalk.uasset and b/Content/Blueprints/Utils/Generators/HumanAI/findSplineToWalk.uasset differ diff --git a/Content/Blueprints/Utils/ParallaxCapturer/M_result_Mat.uasset b/Content/Blueprints/Utils/ParallaxCapturer/M_result_Mat.uasset index 1ec1a7571..6bafc61e8 100644 Binary files a/Content/Blueprints/Utils/ParallaxCapturer/M_result_Mat.uasset and b/Content/Blueprints/Utils/ParallaxCapturer/M_result_Mat.uasset differ diff --git a/Content/Blueprints/world/BM_Elevator.uasset b/Content/Blueprints/world/BM_Elevator.uasset index 24967ae90..6509a8cec 100644 Binary files a/Content/Blueprints/world/BM_Elevator.uasset and b/Content/Blueprints/world/BM_Elevator.uasset differ diff --git a/Content/Furniture/All/Materials/Inst/Metal/MI_Metal_Brushed_Inst.uasset b/Content/Furniture/All/Materials/Inst/Metal/MI_Metal_Brushed_Inst.uasset index b834003d8..e64eb634b 100644 Binary files a/Content/Furniture/All/Materials/Inst/Metal/MI_Metal_Brushed_Inst.uasset and b/Content/Furniture/All/Materials/Inst/Metal/MI_Metal_Brushed_Inst.uasset differ diff --git a/Content/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Materials/MI_Metal_002.uasset b/Content/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Materials/MI_Metal_002.uasset index 5efdfe70e..92c89c843 100644 Binary files a/Content/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Materials/MI_Metal_002.uasset and b/Content/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Materials/MI_Metal_002.uasset differ diff --git a/Content/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Meshes/Bathroom/PB_Mirror_No_Light.uasset b/Content/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Meshes/Bathroom/PB_Mirror_No_Light.uasset index 07ca7f7e0..97ef65437 100644 Binary files a/Content/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Meshes/Bathroom/PB_Mirror_No_Light.uasset and b/Content/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Meshes/Bathroom/PB_Mirror_No_Light.uasset differ diff --git a/Content/Maps/Interior/GP2/S02Lifts.umap b/Content/Maps/Interior/GP2/S02Lifts.umap index 29d503d95..01e6abf45 100644 Binary files a/Content/Maps/Interior/GP2/S02Lifts.umap and b/Content/Maps/Interior/GP2/S02Lifts.umap differ diff --git a/Content/Maps/Interior/GP2/S02liftRefl.umap b/Content/Maps/Interior/GP2/S02liftRefl.umap new file mode 100644 index 000000000..c3e30ea42 Binary files /dev/null and b/Content/Maps/Interior/GP2/S02liftRefl.umap differ diff --git a/Content/Maps/Masharov_Buildings.umap b/Content/Maps/Masharov_Buildings.umap index d4ff1ee88..d27ffb86f 100644 Binary files a/Content/Maps/Masharov_Buildings.umap and b/Content/Maps/Masharov_Buildings.umap differ diff --git a/Content/Maps/Masharov_Landscape.umap b/Content/Maps/Masharov_Landscape.umap index aefc8f6f6..06b240169 100644 Binary files a/Content/Maps/Masharov_Landscape.umap and b/Content/Maps/Masharov_Landscape.umap differ diff --git a/Content/Maps/Masharov_Yard.umap b/Content/Maps/Masharov_Yard.umap index 8f552cd24..e05810cf9 100644 Binary files a/Content/Maps/Masharov_Yard.umap and b/Content/Maps/Masharov_Yard.umap differ diff --git a/Content/Maps/Masharov_cars.umap b/Content/Maps/Masharov_cars.umap index 829949504..320fcdb68 100644 Binary files a/Content/Maps/Masharov_cars.umap and b/Content/Maps/Masharov_cars.umap differ diff --git a/Content/Maps/Masharov_people.umap b/Content/Maps/Masharov_people.umap index ef8cafc9e..9114198f0 100644 Binary files a/Content/Maps/Masharov_people.umap and b/Content/Maps/Masharov_people.umap differ diff --git a/Content/Maps/mainScene.umap b/Content/Maps/mainScene.umap index 7e48ce579..214fa4952 100644 Binary files a/Content/Maps/mainScene.umap and b/Content/Maps/mainScene.umap differ diff --git a/Content/Materials/LiftPanel.uasset b/Content/Materials/LiftPanel.uasset index 5422bf1c7..6b6854b7f 100644 Binary files a/Content/Materials/LiftPanel.uasset and b/Content/Materials/LiftPanel.uasset differ diff --git a/Content/Materials/Masters/Common/M_Emissive.uasset b/Content/Materials/Masters/Common/M_Emissive.uasset index 58769ba32..260ec1820 100644 Binary files a/Content/Materials/Masters/Common/M_Emissive.uasset and b/Content/Materials/Masters/Common/M_Emissive.uasset differ diff --git a/Content/Materials/Masters/Common/M_Glass_ThinRaytraced.uasset b/Content/Materials/Masters/Common/M_Glass_ThinRaytraced.uasset new file mode 100644 index 000000000..53a201525 Binary files /dev/null and b/Content/Materials/Masters/Common/M_Glass_ThinRaytraced.uasset differ diff --git a/Content/Meshes/Exterior/Buildings_Groups/DramTeatr/SM_Bench01_LOD0.uasset b/Content/Meshes/Exterior/Buildings_Groups/DramTeatr/SM_Bench01_LOD0.uasset index b6c0167e8..6ce7a4c4c 100644 Binary files a/Content/Meshes/Exterior/Buildings_Groups/DramTeatr/SM_Bench01_LOD0.uasset and b/Content/Meshes/Exterior/Buildings_Groups/DramTeatr/SM_Bench01_LOD0.uasset differ diff --git a/Content/Meshes/Exterior/Buildings_Groups/DramTeatr/SM_Bench02_LOD0.uasset b/Content/Meshes/Exterior/Buildings_Groups/DramTeatr/SM_Bench02_LOD0.uasset index c7afb916c..20c1beedf 100644 Binary files a/Content/Meshes/Exterior/Buildings_Groups/DramTeatr/SM_Bench02_LOD0.uasset and b/Content/Meshes/Exterior/Buildings_Groups/DramTeatr/SM_Bench02_LOD0.uasset differ diff --git a/Content/Meshes/Exterior/Buildings_Groups/DramTeatr/SM_Bench_Circular_LOD0.uasset b/Content/Meshes/Exterior/Buildings_Groups/DramTeatr/SM_Bench_Circular_LOD0.uasset index d701558f1..4c34185b0 100644 Binary files a/Content/Meshes/Exterior/Buildings_Groups/DramTeatr/SM_Bench_Circular_LOD0.uasset and b/Content/Meshes/Exterior/Buildings_Groups/DramTeatr/SM_Bench_Circular_LOD0.uasset differ diff --git a/Content/Meshes/Exterior/Buildings_Groups/DramTeatr/SM_Flowers_Pot_LOD0.uasset b/Content/Meshes/Exterior/Buildings_Groups/DramTeatr/SM_Flowers_Pot_LOD0.uasset index 448837147..c5b499f0b 100644 Binary files a/Content/Meshes/Exterior/Buildings_Groups/DramTeatr/SM_Flowers_Pot_LOD0.uasset and b/Content/Meshes/Exterior/Buildings_Groups/DramTeatr/SM_Flowers_Pot_LOD0.uasset differ diff --git a/Content/Meshes/Exterior/Buildings_Groups/DramTeatr/SM_LampPost03_LOD0.uasset b/Content/Meshes/Exterior/Buildings_Groups/DramTeatr/SM_LampPost03_LOD0.uasset index bf36f810a..366f1ee34 100644 Binary files a/Content/Meshes/Exterior/Buildings_Groups/DramTeatr/SM_LampPost03_LOD0.uasset and b/Content/Meshes/Exterior/Buildings_Groups/DramTeatr/SM_LampPost03_LOD0.uasset differ diff --git a/Content/Meshes/Interior/GP2/MOP/Elevator/SM_Light_Elevator.uasset b/Content/Meshes/Interior/GP2/MOP/Elevator/SM_Light_Elevator.uasset index d66c42bfc..ea4ed9ad5 100644 Binary files a/Content/Meshes/Interior/GP2/MOP/Elevator/SM_Light_Elevator.uasset and b/Content/Meshes/Interior/GP2/MOP/Elevator/SM_Light_Elevator.uasset differ diff --git a/Content/Meshes/MAF/SM_Bench_1/SM_Bench_1.uasset b/Content/Meshes/MAF/SM_Bench_1/SM_Bench_1.uasset index 1c605417f..37cdfae06 100644 Binary files a/Content/Meshes/MAF/SM_Bench_1/SM_Bench_1.uasset and b/Content/Meshes/MAF/SM_Bench_1/SM_Bench_1.uasset differ diff --git a/Content/Meshes/MAF/SM_Ladder/SM_Ladder.uasset b/Content/Meshes/MAF/SM_Ladder/SM_Ladder.uasset index 51d411fd2..4dc47b121 100644 Binary files a/Content/Meshes/MAF/SM_Ladder/SM_Ladder.uasset and b/Content/Meshes/MAF/SM_Ladder/SM_Ladder.uasset differ diff --git a/Content/Meshes/MAF/SM_MAF_HouseE5002/SM_MAF_HouseE5002.uasset b/Content/Meshes/MAF/SM_MAF_HouseE5002/SM_MAF_HouseE5002.uasset index f92d70fc7..3b7837ea5 100644 Binary files a/Content/Meshes/MAF/SM_MAF_HouseE5002/SM_MAF_HouseE5002.uasset and b/Content/Meshes/MAF/SM_MAF_HouseE5002/SM_MAF_HouseE5002.uasset differ diff --git a/Content/Meshes/MAF/SM_RingTrainer/SM_RingTrainer.uasset b/Content/Meshes/MAF/SM_RingTrainer/SM_RingTrainer.uasset index d4a7db22a..c5dc6f7b1 100644 Binary files a/Content/Meshes/MAF/SM_RingTrainer/SM_RingTrainer.uasset and b/Content/Meshes/MAF/SM_RingTrainer/SM_RingTrainer.uasset differ diff --git a/Content/Meshes/MAF/SM_Swings_2/SM_Climbing_frame_1.uasset b/Content/Meshes/MAF/SM_Swings_2/SM_Climbing_frame_1.uasset index 46f1f2913..ffdf9dc58 100644 Binary files a/Content/Meshes/MAF/SM_Swings_2/SM_Climbing_frame_1.uasset and b/Content/Meshes/MAF/SM_Swings_2/SM_Climbing_frame_1.uasset differ diff --git a/Content/Meshes/MAF/SM_Swings_2/SM_Climbing_frame_2.uasset b/Content/Meshes/MAF/SM_Swings_2/SM_Climbing_frame_2.uasset index cdef568cc..30d33a66f 100644 Binary files a/Content/Meshes/MAF/SM_Swings_2/SM_Climbing_frame_2.uasset and b/Content/Meshes/MAF/SM_Swings_2/SM_Climbing_frame_2.uasset differ diff --git a/Content/Meshes/MAF/SM_Swings_2/SM_Climbing_frame_3.uasset b/Content/Meshes/MAF/SM_Swings_2/SM_Climbing_frame_3.uasset index bfe49ae0b..ec4319521 100644 Binary files a/Content/Meshes/MAF/SM_Swings_2/SM_Climbing_frame_3.uasset and b/Content/Meshes/MAF/SM_Swings_2/SM_Climbing_frame_3.uasset differ diff --git a/Content/Meshes/MAF/SM_Swings_2/SM_Swings_2.uasset b/Content/Meshes/MAF/SM_Swings_2/SM_Swings_2.uasset index 6fcb3bb53..0117f9c75 100644 Binary files a/Content/Meshes/MAF/SM_Swings_2/SM_Swings_2.uasset and b/Content/Meshes/MAF/SM_Swings_2/SM_Swings_2.uasset differ diff --git a/Content/Textures/liftCubemap.uasset b/Content/Textures/liftCubemap.uasset new file mode 100644 index 000000000..dca46074a Binary files /dev/null and b/Content/Textures/liftCubemap.uasset differ