diff --git a/Config/DefaultGame.ini b/Config/DefaultGame.ini index 1d22f40..080064d 100644 --- a/Config/DefaultGame.ini +++ b/Config/DefaultGame.ini @@ -2,5 +2,5 @@ [/Script/EngineSettings.GeneralProjectSettings] ProjectID=2F31DBBE41464D2BEC5D7796DE9D22E9 -bStartInVR=False +bStartInVR=True diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index 2e4c05b..7512305 100644 Binary files a/Config/DefaultInput.ini and b/Config/DefaultInput.ini differ diff --git a/Config/SteamVRBindings/gamepad.json b/Config/SteamVRBindings/gamepad.json index 2d45993..5baeb5c 100644 --- a/Config/SteamVRBindings/gamepad.json +++ b/Config/SteamVRBindings/gamepad.json @@ -9,5 +9,5 @@ "sources": [] } }, - "description": "railwayWorker-10757647" + "description": "railwayWorker-11590370" } \ No newline at end of file diff --git a/Config/SteamVRBindings/holographic_controller.json b/Config/SteamVRBindings/holographic_controller.json index d8e5176..946f55b 100644 --- a/Config/SteamVRBindings/holographic_controller.json +++ b/Config/SteamVRBindings/holographic_controller.json @@ -40,5 +40,5 @@ ] } }, - "description": "railwayWorker-10757647" + "description": "railwayWorker-11590370" } \ No newline at end of file diff --git a/Config/SteamVRBindings/indexhmd.json b/Config/SteamVRBindings/indexhmd.json index a5cd6c7..5c5afa2 100644 --- a/Config/SteamVRBindings/indexhmd.json +++ b/Config/SteamVRBindings/indexhmd.json @@ -9,5 +9,5 @@ "sources": [] } }, - "description": "railwayWorker-10757647" + "description": "railwayWorker-11590370" } \ No newline at end of file diff --git a/Config/SteamVRBindings/knuckles.json b/Config/SteamVRBindings/knuckles.json index 2bdf203..42c5f99 100644 --- a/Config/SteamVRBindings/knuckles.json +++ b/Config/SteamVRBindings/knuckles.json @@ -40,5 +40,5 @@ ] } }, - "description": "railwayWorker-10757647" + "description": "railwayWorker-11590370" } \ No newline at end of file diff --git a/Config/SteamVRBindings/oculus_touch.json b/Config/SteamVRBindings/oculus_touch.json index 09310e1..6e96245 100644 --- a/Config/SteamVRBindings/oculus_touch.json +++ b/Config/SteamVRBindings/oculus_touch.json @@ -40,5 +40,5 @@ ] } }, - "description": "railwayWorker-10757647" + "description": "railwayWorker-11590370" } \ No newline at end of file diff --git a/Config/SteamVRBindings/rift.json b/Config/SteamVRBindings/rift.json index 9d7d62d..e7f3ca6 100644 --- a/Config/SteamVRBindings/rift.json +++ b/Config/SteamVRBindings/rift.json @@ -9,5 +9,5 @@ "sources": [] } }, - "description": "railwayWorker-10757647" + "description": "railwayWorker-11590370" } \ No newline at end of file diff --git a/Config/SteamVRBindings/steamvr_manifest.json b/Config/SteamVRBindings/steamvr_manifest.json index eb6a651..08a56d7 100644 --- a/Config/SteamVRBindings/steamvr_manifest.json +++ b/Config/SteamVRBindings/steamvr_manifest.json @@ -62,11 +62,6 @@ "skeleton": "/skeleton/hand/right", "requirement": "optional" }, - { - "name": "/actions/main/in/open_console", - "type": "boolean", - "requirement": "optional" - }, { "name": "/actions/main/out/vibrateleft", "type": "vibration", @@ -77,6 +72,11 @@ "type": "vibration", "requirement": "optional" }, + { + "name": "/actions/main/in/open_console", + "type": "boolean", + "requirement": "optional" + }, { "name": "/actions/main/in/GripRight", "type": "boolean" @@ -241,9 +241,9 @@ "/actions/main/in/special8": "Special 8 [Tracker]", "/actions/main/in/skeletonleft": "Skeleton (Left)", "/actions/main/in/skeletonright": "Skeleton (Right)", - "/actions/main/in/open_console": "Open Console", "/actions/main/out/vibrateleft": "Haptic (Left)", "/actions/main/out/vibrateright": "Haptic (Right)", + "/actions/main/in/open_console": "Open Console", "/actions/main/in/GripRight": "GripRight", "/actions/main/in/GripLeft": "GripLeft", "/actions/main/in/TriggerRight": "TriggerRight", diff --git a/Config/SteamVRBindings/vive.json b/Config/SteamVRBindings/vive.json index 8a82cb5..9467594 100644 --- a/Config/SteamVRBindings/vive.json +++ b/Config/SteamVRBindings/vive.json @@ -9,5 +9,5 @@ "sources": [] } }, - "description": "railwayWorker-10757647" + "description": "railwayWorker-11590370" } \ No newline at end of file diff --git a/Config/SteamVRBindings/vive_controller.json b/Config/SteamVRBindings/vive_controller.json index 4ab36b0..03d1cff 100644 --- a/Config/SteamVRBindings/vive_controller.json +++ b/Config/SteamVRBindings/vive_controller.json @@ -30,7 +30,7 @@ } }, { - "mode": "button", + "mode": "trigger", "path": "/user/hand/right/input/trigger", "inputs": { @@ -41,7 +41,7 @@ } }, { - "mode": "button", + "mode": "trigger", "path": "/user/hand/left/input/trigger", "inputs": { @@ -227,5 +227,5 @@ ] } }, - "description": "railwayWorker-10757647" + "description": "railwayWorker-11590370" } \ No newline at end of file diff --git a/Config/SteamVRBindings/vive_cosmos_controller.json b/Config/SteamVRBindings/vive_cosmos_controller.json index 50048b8..364f01e 100644 --- a/Config/SteamVRBindings/vive_cosmos_controller.json +++ b/Config/SteamVRBindings/vive_cosmos_controller.json @@ -30,7 +30,7 @@ } }, { - "mode": "button", + "mode": "trigger", "path": "/user/hand/right/input/trigger", "inputs": { @@ -41,7 +41,7 @@ } }, { - "mode": "button", + "mode": "trigger", "path": "/user/hand/left/input/trigger", "inputs": { @@ -61,6 +61,126 @@ "output": "/actions/main/in/ButtonMenu" } } + }, + { + "mode": "dpad", + "path": "/user/hand/left/input/joystick", + "parameters": + { + "sub_mode": "click" + }, + "inputs": + { + "north": + { + "output": "/actions/main/in/LeftJoyMoveUp" + } + } + }, + { + "mode": "dpad", + "path": "/user/hand/left/input/joystick", + "parameters": + { + "sub_mode": "click" + }, + "inputs": + { + "south": + { + "output": "/actions/main/in/LeftJoyMoveDown" + } + } + }, + { + "mode": "dpad", + "path": "/user/hand/right/input/joystick", + "parameters": + { + "sub_mode": "click" + }, + "inputs": + { + "north": + { + "output": "/actions/main/in/RightJoyMoveUp" + } + } + }, + { + "mode": "dpad", + "path": "/user/hand/right/input/joystick", + "parameters": + { + "sub_mode": "click" + }, + "inputs": + { + "south": + { + "output": "/actions/main/in/RightJoyMoveDown" + } + } + }, + { + "mode": "dpad", + "path": "/user/hand/left/input/joystick", + "parameters": + { + "sub_mode": "click" + }, + "inputs": + { + "west": + { + "output": "/actions/main/in/LeftJoyMoveLeft" + } + } + }, + { + "mode": "dpad", + "path": "/user/hand/right/input/joystick", + "parameters": + { + "sub_mode": "click" + }, + "inputs": + { + "west": + { + "output": "/actions/main/in/RightJoyMoveLeft" + } + } + }, + { + "mode": "dpad", + "path": "/user/hand/left/input/joystick", + "parameters": + { + "sub_mode": "click" + }, + "inputs": + { + "east": + { + "output": "/actions/main/in/leftJoyMoveRight" + } + } + }, + { + "mode": "dpad", + "path": "/user/hand/right/input/joystick", + "parameters": + { + "sub_mode": "click" + }, + "inputs": + { + "east": + { + "output": "/actions/main/in/RightJoyMoveRight" + } + } } ], "poses": [ @@ -96,5 +216,5 @@ ] } }, - "description": "railwayWorker-10757647" + "description": "railwayWorker-11590370" } \ No newline at end of file diff --git a/Config/SteamVRBindings/vive_pro.json b/Config/SteamVRBindings/vive_pro.json index 4293f51..f4ff68b 100644 --- a/Config/SteamVRBindings/vive_pro.json +++ b/Config/SteamVRBindings/vive_pro.json @@ -9,5 +9,5 @@ "sources": [] } }, - "description": "railwayWorker-10757647" + "description": "railwayWorker-11590370" } \ No newline at end of file diff --git a/Config/SteamVRBindings/vive_tracker_camera.json b/Config/SteamVRBindings/vive_tracker_camera.json index 63c56f0..fe3a8ee 100644 --- a/Config/SteamVRBindings/vive_tracker_camera.json +++ b/Config/SteamVRBindings/vive_tracker_camera.json @@ -30,7 +30,7 @@ } }, { - "mode": "button", + "mode": "trigger", "path": "/user/hand/right/input/trigger", "inputs": { @@ -41,7 +41,7 @@ } }, { - "mode": "button", + "mode": "trigger", "path": "/user/hand/left/input/trigger", "inputs": { @@ -238,5 +238,5 @@ ] } }, - "description": "railwayWorker-10757647" + "description": "railwayWorker-11590370" } \ No newline at end of file diff --git a/Content/AssetPacks/TB/Maps/VokzalMap.umap b/Content/AssetPacks/TB/Maps/VokzalMap.umap index 95c79ee..bc885c9 100644 Binary files a/Content/AssetPacks/TB/Maps/VokzalMap.umap and b/Content/AssetPacks/TB/Maps/VokzalMap.umap differ diff --git a/Content/test/Blueprints/RailwayCarriages/BP_RailwayCarriage.uasset b/Content/test/Blueprints/RailwayCarriages/BP_RailwayCarriage.uasset index 5f33c5c..bd7a87c 100644 Binary files a/Content/test/Blueprints/RailwayCarriages/BP_RailwayCarriage.uasset and b/Content/test/Blueprints/RailwayCarriages/BP_RailwayCarriage.uasset differ diff --git a/Content/test/Blueprints/player/motionController.uasset b/Content/test/Blueprints/player/motionController.uasset index 340d4ea..32f0319 100644 Binary files a/Content/test/Blueprints/player/motionController.uasset and b/Content/test/Blueprints/player/motionController.uasset differ diff --git a/Content/test/Blueprints/player/player.uasset b/Content/test/Blueprints/player/player.uasset index c41968b..f03a546 100644 Binary files a/Content/test/Blueprints/player/player.uasset and b/Content/test/Blueprints/player/player.uasset differ diff --git a/Content/test/Blueprints/player/playerMenu.uasset b/Content/test/Blueprints/player/playerMenu.uasset index 664ca77..7e59ed3 100644 Binary files a/Content/test/Blueprints/player/playerMenu.uasset and b/Content/test/Blueprints/player/playerMenu.uasset differ diff --git a/Content/test/Blueprints/playerController/playerControllerRailwayWorkerMenu.uasset b/Content/test/Blueprints/playerController/playerControllerRailwayWorkerMenu.uasset index 1bc0235..edb000a 100644 Binary files a/Content/test/Blueprints/playerController/playerControllerRailwayWorkerMenu.uasset and b/Content/test/Blueprints/playerController/playerControllerRailwayWorkerMenu.uasset differ diff --git a/Content/test/Blueprints/scenario/Scenario.uasset b/Content/test/Blueprints/scenario/Scenario.uasset index c5983ca..35adf53 100644 Binary files a/Content/test/Blueprints/scenario/Scenario.uasset and b/Content/test/Blueprints/scenario/Scenario.uasset differ diff --git a/Content/test/Levels/Main.umap b/Content/test/Levels/Main.umap index 0f10cfd..2d1ef35 100644 Binary files a/Content/test/Levels/Main.umap and b/Content/test/Levels/Main.umap differ diff --git a/Content/test/UI/MAinMEnu/UI_MainMenu.uasset b/Content/test/UI/MAinMEnu/UI_MainMenu.uasset index 6b87ced..08db374 100644 Binary files a/Content/test/UI/MAinMEnu/UI_MainMenu.uasset and b/Content/test/UI/MAinMEnu/UI_MainMenu.uasset differ