diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index e79f973..4c7fdc6 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -2,6 +2,7 @@ bEnabled=true [OnlineSubsystem] +DefaultPlatformService=Null bHasVoiceEnabled=true [/Script/HardwareTargeting.HardwareTargetingSettings] @@ -97,3 +98,6 @@ r.AllowStaticLighting=False [/Script/Engine.UserInterfaceSettings] UIScaleCurve=(EditorCurveData=(Keys=((Time=1593.897949,Value=1.000000),(Time=8640.000000,Value=8.000000)),DefaultValue=340282346638528859811704183484516925440.000000,PreInfinityExtrap=RCCE_Constant,PostInfinityExtrap=RCCE_Constant),ExternalCurve=None) +[/Script/Engine.AudioSettings] +VoiPSampleRate=Normal24000Hz + diff --git a/Config/DefaultGame.ini b/Config/DefaultGame.ini index d0ac5c8..f30cfb6 100644 --- a/Config/DefaultGame.ini +++ b/Config/DefaultGame.ini @@ -4,6 +4,8 @@ ProjectID=F53A199F4510F4FB800A37BAC6575029 [/Script/UnrealEd.ProjectPackagingSettings] IncludePrerequisites=False +bGenerateChunks=True [/Script/Engine.GameSession] -bRequiresPushToTalk=true \ No newline at end of file +bRequiresPushToTalk=true + diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index 77e6af9..329d4cf 100644 --- a/Config/DefaultInput.ini +++ b/Config/DefaultInput.ini @@ -87,6 +87,14 @@ DoubleClickTime=0.200000 +ActionMappings=(ActionName="SelectEquipR",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Vive_Right_Grip_Click) +ActionMappings=(ActionName="Voice",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Vive_Left_Menu_Click) +ActionMappings=(ActionName="Voice",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Vive_Right_Menu_Click) ++ActionMappings=(ActionName="TeleportR",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Right_Thumbstick_Click) ++ActionMappings=(ActionName="TriggerR",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Right_Trigger_Click) ++ActionMappings=(ActionName="TeleportL",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Left_Thumbstick_Click) ++ActionMappings=(ActionName="TriggerL",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Left_Trigger_Click) ++ActionMappings=(ActionName="SelectEquipL",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Left_Grip_Click) ++ActionMappings=(ActionName="SelectEquipR",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Right_Grip_Click) ++ActionMappings=(ActionName="Voice",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Left_Menu_Click) ++ActionMappings=(ActionName="Voice",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Right_System_Click) +AxisMappings=(AxisName="MovingFwd",Scale=1.000000,Key=W) +AxisMappings=(AxisName="MovingFwd",Scale=-1.000000,Key=S) +AxisMappings=(AxisName="MovingRt",Scale=1.000000,Key=D) @@ -98,6 +106,12 @@ DoubleClickTime=0.200000 +AxisMappings=(AxisName="trackL_X",Scale=1.000000,Key=Vive_Left_Trackpad_X) +AxisMappings=(AxisName="trackR_X",Scale=1.000000,Key=Vive_Right_Trackpad_X) +AxisMappings=(AxisName="trackL_Y",Scale=1.000000,Key=Vive_Left_Trackpad_Y) ++AxisMappings=(AxisName="trackR_Y",Scale=1.000000,Key=OculusTouch_Right_Thumbstick_Y) ++AxisMappings=(AxisName="TriggerL",Scale=1.000000,Key=OculusTouch_Left_Trigger_Axis) ++AxisMappings=(AxisName="TriggerR",Scale=1.000000,Key=OculusTouch_Right_Trigger_Axis) ++AxisMappings=(AxisName="trackL_X",Scale=1.000000,Key=OculusTouch_Left_Thumbstick_X) ++AxisMappings=(AxisName="trackR_X",Scale=1.000000,Key=OculusTouch_Right_Thumbstick_X) ++AxisMappings=(AxisName="trackL_Y",Scale=1.000000,Key=OculusTouch_Left_Thumbstick_Y) +AxisMappings=(AxisName="trackR_Y",Scale=1.000000,Key=Vive_Right_Trackpad_Y) DefaultTouchInterface=/Engine/MobileResources/HUD/DefaultVirtualJoysticks.DefaultVirtualJoysticks -ConsoleKeys=Tilde diff --git a/Config/SteamVRBindings/gamepad.json b/Config/SteamVRBindings/gamepad.json index 7e068da..024f1e9 100644 --- a/Config/SteamVRBindings/gamepad.json +++ b/Config/SteamVRBindings/gamepad.json @@ -9,5 +9,5 @@ "sources": [] } }, - "description": "" + "description": "DJDPersonal-14469661" } \ No newline at end of file diff --git a/Config/SteamVRBindings/holographic_controller.json b/Config/SteamVRBindings/holographic_controller.json index 1d6b62a..b0f547e 100644 --- a/Config/SteamVRBindings/holographic_controller.json +++ b/Config/SteamVRBindings/holographic_controller.json @@ -40,5 +40,5 @@ ] } }, - "description": "" + "description": "DJDPersonal-14469661" } \ No newline at end of file diff --git a/Config/SteamVRBindings/indexhmd.json b/Config/SteamVRBindings/indexhmd.json index 1062aca..acbfa11 100644 --- a/Config/SteamVRBindings/indexhmd.json +++ b/Config/SteamVRBindings/indexhmd.json @@ -9,5 +9,5 @@ "sources": [] } }, - "description": "" + "description": "DJDPersonal-14469661" } \ No newline at end of file diff --git a/Config/SteamVRBindings/knuckles.json b/Config/SteamVRBindings/knuckles.json index df89f0f..7be6e88 100644 --- a/Config/SteamVRBindings/knuckles.json +++ b/Config/SteamVRBindings/knuckles.json @@ -40,5 +40,5 @@ ] } }, - "description": "" + "description": "DJDPersonal-14469661" } \ No newline at end of file diff --git a/Config/SteamVRBindings/oculus_touch.json b/Config/SteamVRBindings/oculus_touch.json index bd9f798..9fcc7a8 100644 --- a/Config/SteamVRBindings/oculus_touch.json +++ b/Config/SteamVRBindings/oculus_touch.json @@ -6,7 +6,129 @@ { "/actions/main": { - "sources": [], + "sources": [ + { + "mode": "joystick", + "path": "/user/hand/right/input/joystick", + "inputs": + { + "click": + { + "output": "/actions/main/in/TeleportR" + } + } + }, + { + "mode": "trigger", + "path": "/user/hand/right/input/trigger", + "inputs": + { + "click": + { + "output": "/actions/main/in/TriggerR" + } + } + }, + { + "mode": "joystick", + "path": "/user/hand/left/input/joystick", + "inputs": + { + "click": + { + "output": "/actions/main/in/TeleportL" + } + } + }, + { + "mode": "trigger", + "path": "/user/hand/left/input/trigger", + "inputs": + { + "click": + { + "output": "/actions/main/in/TriggerL" + } + } + }, + { + "mode": "trigger", + "path": "/user/hand/left/input/grip", + "inputs": + { + "click": + { + "output": "/actions/main/in/SelectEquipL" + } + } + }, + { + "mode": "trigger", + "path": "/user/hand/right/input/grip", + "inputs": + { + "click": + { + "output": "/actions/main/in/SelectEquipR" + } + } + }, + { + "mode": "button", + "path": "/user/hand/left/input/application_menu", + "inputs": + { + "click": + { + "output": "/actions/main/in/Voice" + } + } + }, + { + "mode": "trigger", + "path": "/user/hand/left/input/trigger", + "inputs": + { + "pull": + { + "output": "/actions/main/in/TriggerL axis" + } + } + }, + { + "mode": "trigger", + "path": "/user/hand/right/input/trigger", + "inputs": + { + "pull": + { + "output": "/actions/main/in/TriggerR axis" + } + } + }, + { + "mode": "joystick", + "path": "/user/hand/left/input/joystick", + "inputs": + { + "position": + { + "output": "/actions/main/in/trackL_X,trackL_Y X Y_axis2d" + } + } + }, + { + "mode": "joystick", + "path": "/user/hand/right/input/joystick", + "inputs": + { + "position": + { + "output": "/actions/main/in/trackR_X,trackR_Y X Y_axis2d" + } + } + } + ], "poses": [ { "output": "/actions/main/in/controllerleft", @@ -40,5 +162,5 @@ ] } }, - "description": "" + "description": "DJDPersonal-14469661" } \ No newline at end of file diff --git a/Config/SteamVRBindings/rift.json b/Config/SteamVRBindings/rift.json index 6a8a006..78b4ddb 100644 --- a/Config/SteamVRBindings/rift.json +++ b/Config/SteamVRBindings/rift.json @@ -9,5 +9,5 @@ "sources": [] } }, - "description": "" + "description": "DJDPersonal-14469661" } \ No newline at end of file diff --git a/Config/SteamVRBindings/steamvr_manifest.json b/Config/SteamVRBindings/steamvr_manifest.json index 2859b22..7d67c8c 100644 --- a/Config/SteamVRBindings/steamvr_manifest.json +++ b/Config/SteamVRBindings/steamvr_manifest.json @@ -129,6 +129,50 @@ } ], "default_bindings": [ + { + "controller_type": "gamepad", + "binding_url": "gamepad.json" + }, + { + "controller_type": "holographic_controller", + "binding_url": "holographic_controller.json" + }, + { + "controller_type": "indexhmd", + "binding_url": "indexhmd.json" + }, + { + "controller_type": "knuckles", + "binding_url": "knuckles.json" + }, + { + "controller_type": "oculus_touch", + "binding_url": "oculus_touch.json" + }, + { + "controller_type": "rift", + "binding_url": "rift.json" + }, + { + "controller_type": "vive", + "binding_url": "vive.json" + }, + { + "controller_type": "vive_controller", + "binding_url": "vive_controller.json" + }, + { + "controller_type": "vive_cosmos_controller", + "binding_url": "vive_cosmos_controller.json" + }, + { + "controller_type": "vive_pro", + "binding_url": "vive_pro.json" + }, + { + "controller_type": "vive_tracker_camera", + "binding_url": "vive_tracker_camera.json" + }, { "controller_type": "knuckles", "binding_url": "knuckles.json" diff --git a/Config/SteamVRBindings/vive.json b/Config/SteamVRBindings/vive.json index 607daa2..3be0501 100644 --- a/Config/SteamVRBindings/vive.json +++ b/Config/SteamVRBindings/vive.json @@ -9,5 +9,5 @@ "sources": [] } }, - "description": "" + "description": "DJDPersonal-14469661" } \ No newline at end of file diff --git a/Config/SteamVRBindings/vive_controller.json b/Config/SteamVRBindings/vive_controller.json index 02d0f74..400a195 100644 --- a/Config/SteamVRBindings/vive_controller.json +++ b/Config/SteamVRBindings/vive_controller.json @@ -173,5 +173,5 @@ ] } }, - "description": "" + "description": "DJDPersonal-14469661" } \ No newline at end of file diff --git a/Config/SteamVRBindings/vive_cosmos_controller.json b/Config/SteamVRBindings/vive_cosmos_controller.json index 0bea4ba..6504aea 100644 --- a/Config/SteamVRBindings/vive_cosmos_controller.json +++ b/Config/SteamVRBindings/vive_cosmos_controller.json @@ -40,5 +40,5 @@ ] } }, - "description": "" + "description": "DJDPersonal-14469661" } \ No newline at end of file diff --git a/Config/SteamVRBindings/vive_pro.json b/Config/SteamVRBindings/vive_pro.json index 5a61458..8e1497d 100644 --- a/Config/SteamVRBindings/vive_pro.json +++ b/Config/SteamVRBindings/vive_pro.json @@ -9,5 +9,5 @@ "sources": [] } }, - "description": "" + "description": "DJDPersonal-14469661" } \ No newline at end of file diff --git a/Config/SteamVRBindings/vive_tracker_camera.json b/Config/SteamVRBindings/vive_tracker_camera.json index 4303691..a92d149 100644 --- a/Config/SteamVRBindings/vive_tracker_camera.json +++ b/Config/SteamVRBindings/vive_tracker_camera.json @@ -184,5 +184,5 @@ ] } }, - "description": "" + "description": "DJDPersonal-14469661" } \ No newline at end of file diff --git a/Config/steamvr_ue_editor_app.json b/Config/steamvr_ue_editor_app.json index 54eca20..a17d47b 100644 --- a/Config/steamvr_ue_editor_app.json +++ b/Config/steamvr_ue_editor_app.json @@ -5,7 +5,7 @@ "app_key": "application.generated.ue.djdpersonal-14469661.ue4editor.exe", "launch_type": "url", "url": "steam://launch/", - "action_manifest_path": "C:/Projects/DJDPersonal/Config/SteamVRBindings/steamvr_manifest.json", + "action_manifest_path": "D:/UnrealEngine4/Projects/DJDPersonal/Config/SteamVRBindings/steamvr_manifest.json", "strings": { "en_us": diff --git a/Content/Asset/Geometry/BellBenchLamp/BP_lamp.uasset b/Content/Asset/Geometry/BellBenchLamp/BP_lamp.uasset index 6e6e664..9c3cf88 100644 Binary files a/Content/Asset/Geometry/BellBenchLamp/BP_lamp.uasset and b/Content/Asset/Geometry/BellBenchLamp/BP_lamp.uasset differ diff --git a/Content/Asset/Geometry/FireWagon/FireCistern.uasset b/Content/Asset/Geometry/FireWagon/FireCistern.uasset new file mode 100644 index 0000000..ab005db Binary files /dev/null and b/Content/Asset/Geometry/FireWagon/FireCistern.uasset differ diff --git a/Content/Asset/Geometry/FireWagon/FireCistern1.uasset b/Content/Asset/Geometry/FireWagon/FireCistern1.uasset new file mode 100644 index 0000000..a83f02f Binary files /dev/null and b/Content/Asset/Geometry/FireWagon/FireCistern1.uasset differ diff --git a/Content/Asset/Geometry/FireWagon/FireWagon.uasset b/Content/Asset/Geometry/FireWagon/FireWagon.uasset new file mode 100644 index 0000000..603e36f Binary files /dev/null and b/Content/Asset/Geometry/FireWagon/FireWagon.uasset differ diff --git a/Content/Asset/Geometry/FireWagon/Glass.uasset b/Content/Asset/Geometry/FireWagon/Glass.uasset new file mode 100644 index 0000000..61452cb Binary files /dev/null and b/Content/Asset/Geometry/FireWagon/Glass.uasset differ diff --git a/Content/Asset/Geometry/FireWagon/T_FireCistern_BC.uasset b/Content/Asset/Geometry/FireWagon/T_FireCistern_BC.uasset new file mode 100644 index 0000000..bff65e1 Binary files /dev/null and b/Content/Asset/Geometry/FireWagon/T_FireCistern_BC.uasset differ diff --git a/Content/Asset/Geometry/FireWagon/T_FireCistern_N.uasset b/Content/Asset/Geometry/FireWagon/T_FireCistern_N.uasset new file mode 100644 index 0000000..e669813 Binary files /dev/null and b/Content/Asset/Geometry/FireWagon/T_FireCistern_N.uasset differ diff --git a/Content/Asset/Geometry/FireWagon/T_FireCistern_ORM.uasset b/Content/Asset/Geometry/FireWagon/T_FireCistern_ORM.uasset new file mode 100644 index 0000000..90abbcd Binary files /dev/null and b/Content/Asset/Geometry/FireWagon/T_FireCistern_ORM.uasset differ diff --git a/Content/Asset/Geometry/FireWagon/T_FireWagon_BC.uasset b/Content/Asset/Geometry/FireWagon/T_FireWagon_BC.uasset new file mode 100644 index 0000000..ab2871b Binary files /dev/null and b/Content/Asset/Geometry/FireWagon/T_FireWagon_BC.uasset differ diff --git a/Content/Asset/Geometry/FireWagon/T_FireWagon_N.uasset b/Content/Asset/Geometry/FireWagon/T_FireWagon_N.uasset new file mode 100644 index 0000000..d4ea2ac Binary files /dev/null and b/Content/Asset/Geometry/FireWagon/T_FireWagon_N.uasset differ diff --git a/Content/Asset/Railway/Weel/T_Weel_Rust.uasset b/Content/Asset/Geometry/FireWagon/T_FireWagon_ORM.uasset similarity index 62% rename from Content/Asset/Railway/Weel/T_Weel_Rust.uasset rename to Content/Asset/Geometry/FireWagon/T_FireWagon_ORM.uasset index b434da3..278a069 100644 Binary files a/Content/Asset/Railway/Weel/T_Weel_Rust.uasset and b/Content/Asset/Geometry/FireWagon/T_FireWagon_ORM.uasset differ diff --git a/Content/Asset/Geometry/FireWagon/Wagon.uasset b/Content/Asset/Geometry/FireWagon/Wagon.uasset new file mode 100644 index 0000000..e6038bb Binary files /dev/null and b/Content/Asset/Geometry/FireWagon/Wagon.uasset differ diff --git a/Content/Asset/Geometry/FireWagon/Wheels.uasset b/Content/Asset/Geometry/FireWagon/Wheels.uasset new file mode 100644 index 0000000..cddc10c Binary files /dev/null and b/Content/Asset/Geometry/FireWagon/Wheels.uasset differ diff --git a/Content/Asset/Geometry/Rink/SM_rink_SM_main_skating_rink.uasset b/Content/Asset/Geometry/Rink/SM_rink_SM_main_skating_rink.uasset index 3af29eb..78de993 100644 Binary files a/Content/Asset/Geometry/Rink/SM_rink_SM_main_skating_rink.uasset and b/Content/Asset/Geometry/Rink/SM_rink_SM_main_skating_rink.uasset differ diff --git a/Content/Asset/Geometry/Station/SM_station.uasset b/Content/Asset/Geometry/Station/SM_station.uasset index 8635022..8cbf0c3 100644 Binary files a/Content/Asset/Geometry/Station/SM_station.uasset and b/Content/Asset/Geometry/Station/SM_station.uasset differ diff --git a/Content/Asset/Geometry/Wall_lamp/BP_wall_lamp.uasset b/Content/Asset/Geometry/Wall_lamp/BP_wall_lamp.uasset index 9f45ddb..4e33b99 100644 Binary files a/Content/Asset/Geometry/Wall_lamp/BP_wall_lamp.uasset and b/Content/Asset/Geometry/Wall_lamp/BP_wall_lamp.uasset differ diff --git a/Content/Asset/Landscape/SM_landscape_SM_landscape_square_042.uasset b/Content/Asset/Landscape/SM_landscape_SM_landscape_square_042.uasset index 03a24da..2e4bc21 100644 Binary files a/Content/Asset/Landscape/SM_landscape_SM_landscape_square_042.uasset and b/Content/Asset/Landscape/SM_landscape_SM_landscape_square_042.uasset differ diff --git a/Content/Asset/NewRailways/Railways/SM_Rails.uasset b/Content/Asset/NewRailways/Railways/SM_Rails.uasset index 0463a40..e0154a0 100644 Binary files a/Content/Asset/NewRailways/Railways/SM_Rails.uasset and b/Content/Asset/NewRailways/Railways/SM_Rails.uasset differ diff --git a/Content/Asset/Railway/TY10/SM_Ty10.uasset b/Content/Asset/Railway/TY10/SM_Ty10.uasset index 898fa7c..fff668e 100644 Binary files a/Content/Asset/Railway/TY10/SM_Ty10.uasset and b/Content/Asset/Railway/TY10/SM_Ty10.uasset differ diff --git a/Content/Asset/Railway/Vagon/SM_Cart_Damages_SM_Wheel.uasset b/Content/Asset/Railway/Vagon/SM_Cart_Damages_SM_Wheel.uasset index 74bb1e0..9ff686d 100644 Binary files a/Content/Asset/Railway/Vagon/SM_Cart_Damages_SM_Wheel.uasset and b/Content/Asset/Railway/Vagon/SM_Cart_Damages_SM_Wheel.uasset differ diff --git a/Content/Asset/Railway/Weel/MI_Weel_BlackMetal.uasset b/Content/Asset/Railway/Weel/MI_Weel_BlackMetal.uasset deleted file mode 100644 index 6946bbe..0000000 Binary files a/Content/Asset/Railway/Weel/MI_Weel_BlackMetal.uasset and /dev/null differ diff --git a/Content/Asset/Railway/Weel/MI_Weel_Wheels.uasset b/Content/Asset/Railway/Weel/MI_Weel_Wheels.uasset deleted file mode 100644 index a5277f7..0000000 Binary files a/Content/Asset/Railway/Weel/MI_Weel_Wheels.uasset and /dev/null differ diff --git a/Content/Asset/Railway/Weel/MI_Weel_WhiteMetal.uasset b/Content/Asset/Railway/Weel/MI_Weel_WhiteMetal.uasset deleted file mode 100644 index a0575ee..0000000 Binary files a/Content/Asset/Railway/Weel/MI_Weel_WhiteMetal.uasset and /dev/null differ diff --git a/Content/Asset/Railway/Weel/SM_Weel.uasset b/Content/Asset/Railway/Weel/SM_Weel.uasset deleted file mode 100644 index 2ec507f..0000000 Binary files a/Content/Asset/Railway/Weel/SM_Weel.uasset and /dev/null differ diff --git a/Content/Asset/Railway/Weel/T_Weel_AO.uasset b/Content/Asset/Railway/Weel/T_Weel_AO.uasset deleted file mode 100644 index 6d41e1c..0000000 Binary files a/Content/Asset/Railway/Weel/T_Weel_AO.uasset and /dev/null differ diff --git a/Content/Asset/Railway/Weel/T_Weel_Dirt.uasset b/Content/Asset/Railway/Weel/T_Weel_Dirt.uasset deleted file mode 100644 index fb99a1e..0000000 Binary files a/Content/Asset/Railway/Weel/T_Weel_Dirt.uasset and /dev/null differ diff --git a/Content/Asset/Sculptures/SM_snail_Blueprint.uasset b/Content/Asset/Sculptures/SM_snail_Blueprint.uasset index cec20ee..89cdae5 100644 Binary files a/Content/Asset/Sculptures/SM_snail_Blueprint.uasset and b/Content/Asset/Sculptures/SM_snail_Blueprint.uasset differ diff --git a/Content/Asset/assets1.uasset b/Content/Asset/assets1.uasset new file mode 100644 index 0000000..3949121 Binary files /dev/null and b/Content/Asset/assets1.uasset differ diff --git a/Content/AssetPacks/CarMoveSpline/BP/BP_CarSpline.uasset b/Content/AssetPacks/CarMoveSpline/BP/BP_CarSpline.uasset index efebbc3..3cc35b8 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/BP_CarStatic.uasset b/Content/AssetPacks/CarMoveSpline/BP/BP_CarStatic.uasset index 1f697dd..f913921 100644 Binary files a/Content/AssetPacks/CarMoveSpline/BP/BP_CarStatic.uasset and b/Content/AssetPacks/CarMoveSpline/BP/BP_CarStatic.uasset differ diff --git a/Content/AssetPacks/People/Railway/Animations/SK_RailwaymanWithFlag_Anim.uasset b/Content/AssetPacks/People/Railway/Animations/SK_RailwaymanWithFlag_Anim.uasset index 5d4e8c8..a792f4f 100644 Binary files a/Content/AssetPacks/People/Railway/Animations/SK_RailwaymanWithFlag_Anim.uasset and b/Content/AssetPacks/People/Railway/Animations/SK_RailwaymanWithFlag_Anim.uasset differ diff --git a/Content/AssetPacks/People/Railway/Animations/SK_RailwaymanWithFlag_Anim_Pantograph_Day.uasset b/Content/AssetPacks/People/Railway/Animations/SK_RailwaymanWithFlag_Anim_Pantograph_Day.uasset new file mode 100644 index 0000000..b8201f3 Binary files /dev/null and b/Content/AssetPacks/People/Railway/Animations/SK_RailwaymanWithFlag_Anim_Pantograph_Day.uasset differ diff --git a/Content/AssetPacks/People/Railway/Animations/SK_RailwaymanWithFlag_Anim_Pantograph_Night.uasset b/Content/AssetPacks/People/Railway/Animations/SK_RailwaymanWithFlag_Anim_Pantograph_Night.uasset new file mode 100644 index 0000000..ff2f962 Binary files /dev/null and b/Content/AssetPacks/People/Railway/Animations/SK_RailwaymanWithFlag_Anim_Pantograph_Night.uasset differ diff --git a/Content/AssetPacks/assets2.uasset b/Content/AssetPacks/assets2.uasset new file mode 100644 index 0000000..9ac0c6b Binary files /dev/null and b/Content/AssetPacks/assets2.uasset differ diff --git a/Content/Blueprints/BP.uasset b/Content/Blueprints/BP.uasset new file mode 100644 index 0000000..84db546 Binary files /dev/null and b/Content/Blueprints/BP.uasset differ diff --git a/Content/Blueprints/BP_TY10.uasset b/Content/Blueprints/BP_TY10.uasset index 924e02b..24390d9 100644 Binary files a/Content/Blueprints/BP_TY10.uasset and b/Content/Blueprints/BP_TY10.uasset differ diff --git a/Content/Blueprints/BP_Vagon.uasset b/Content/Blueprints/BP_Vagon.uasset index d59a1f1..0979f40 100644 Binary files a/Content/Blueprints/BP_Vagon.uasset and b/Content/Blueprints/BP_Vagon.uasset differ diff --git a/Content/Blueprints/BP_fireWag.uasset b/Content/Blueprints/BP_fireWag.uasset new file mode 100644 index 0000000..87a340a Binary files /dev/null and b/Content/Blueprints/BP_fireWag.uasset differ diff --git a/Content/Blueprints/BP_fireWag1.uasset b/Content/Blueprints/BP_fireWag1.uasset new file mode 100644 index 0000000..5a5c1ba Binary files /dev/null and b/Content/Blueprints/BP_fireWag1.uasset differ diff --git a/Content/Blueprints/Player/Driver.uasset b/Content/Blueprints/Player/Driver.uasset index 764533d..8df34d1 100644 Binary files a/Content/Blueprints/Player/Driver.uasset and b/Content/Blueprints/Player/Driver.uasset differ diff --git a/Content/Blueprints/Player/GI.uasset b/Content/Blueprints/Player/GI.uasset index e0bdff9..80b8b4a 100644 Binary files a/Content/Blueprints/Player/GI.uasset and b/Content/Blueprints/Player/GI.uasset differ diff --git a/Content/Blueprints/Player/VR/BP_Manometr.uasset b/Content/Blueprints/Player/VR/BP_Manometr.uasset index cbdcdc9..5c99c63 100644 Binary files a/Content/Blueprints/Player/VR/BP_Manometr.uasset and b/Content/Blueprints/Player/VR/BP_Manometr.uasset differ diff --git a/Content/Blueprints/Player/VR/BP_MotionController.uasset b/Content/Blueprints/Player/VR/BP_MotionController.uasset index e26cefc..0ae9d87 100644 Binary files a/Content/Blueprints/Player/VR/BP_MotionController.uasset and b/Content/Blueprints/Player/VR/BP_MotionController.uasset differ diff --git a/Content/Blueprints/Player/VR/BP_Pirometer.uasset b/Content/Blueprints/Player/VR/BP_Pirometer.uasset index 18016dd..9db8d51 100644 Binary files a/Content/Blueprints/Player/VR/BP_Pirometer.uasset and b/Content/Blueprints/Player/VR/BP_Pirometer.uasset differ diff --git a/Content/Blueprints/Player/VR/Ipad.uasset b/Content/Blueprints/Player/VR/Ipad.uasset index 3cb59a9..d57cace 100644 Binary files a/Content/Blueprints/Player/VR/Ipad.uasset and b/Content/Blueprints/Player/VR/Ipad.uasset differ diff --git a/Content/Blueprints/Player/VR/Materials/M_TeleportPreviews.uasset b/Content/Blueprints/Player/VR/Materials/M_TeleportPreviews.uasset index faefccb..33c2174 100644 Binary files a/Content/Blueprints/Player/VR/Materials/M_TeleportPreviews.uasset and b/Content/Blueprints/Player/VR/Materials/M_TeleportPreviews.uasset differ diff --git a/Content/Blueprints/Player/VR/MotionControllerPawn.uasset b/Content/Blueprints/Player/VR/MotionControllerPawn.uasset index 45f1986..5145d64 100644 Binary files a/Content/Blueprints/Player/VR/MotionControllerPawn.uasset and b/Content/Blueprints/Player/VR/MotionControllerPawn.uasset differ diff --git a/Content/Blueprints/Player/myGM.uasset b/Content/Blueprints/Player/myGM.uasset index c6f4d54..2a80a2e 100644 Binary files a/Content/Blueprints/Player/myGM.uasset and b/Content/Blueprints/Player/myGM.uasset differ diff --git a/Content/Blueprints/Player/myGS.uasset b/Content/Blueprints/Player/myGS.uasset new file mode 100644 index 0000000..6c208d4 Binary files /dev/null and b/Content/Blueprints/Player/myGS.uasset differ diff --git a/Content/Blueprints/Player/myPC.uasset b/Content/Blueprints/Player/myPC.uasset index e5bc2a3..54e2b95 100644 Binary files a/Content/Blueprints/Player/myPC.uasset and b/Content/Blueprints/Player/myPC.uasset differ diff --git a/Content/Blueprints/UI/IpadW.uasset b/Content/Blueprints/UI/IpadW.uasset index 6b964fd..43df34f 100644 Binary files a/Content/Blueprints/UI/IpadW.uasset and b/Content/Blueprints/UI/IpadW.uasset differ diff --git a/Content/Blueprints/UI/loading.uasset b/Content/Blueprints/UI/loading.uasset index 92e249f..9cee33b 100644 Binary files a/Content/Blueprints/UI/loading.uasset and b/Content/Blueprints/UI/loading.uasset differ diff --git a/Content/Blueprints/Utils/GetSome.uasset b/Content/Blueprints/Utils/GetSome.uasset index a00b7ca..d408ecc 100644 Binary files a/Content/Blueprints/Utils/GetSome.uasset and b/Content/Blueprints/Utils/GetSome.uasset differ diff --git a/Content/Blueprints/World/Spawners/Arrow.uasset b/Content/Blueprints/World/Spawners/Arrow.uasset index 8a79e49..82c4d34 100644 Binary files a/Content/Blueprints/World/Spawners/Arrow.uasset and b/Content/Blueprints/World/Spawners/Arrow.uasset differ diff --git a/Content/Blueprints/World/Spawners/TroubleOnWay.uasset b/Content/Blueprints/World/Spawners/TroubleOnWay.uasset index 0f79177..285780b 100644 Binary files a/Content/Blueprints/World/Spawners/TroubleOnWay.uasset and b/Content/Blueprints/World/Spawners/TroubleOnWay.uasset differ diff --git a/Content/Blueprints/World/Spawners/Wagon.uasset b/Content/Blueprints/World/Spawners/Wagon.uasset index 3cc1723..c750aa3 100644 Binary files a/Content/Blueprints/World/Spawners/Wagon.uasset and b/Content/Blueprints/World/Spawners/Wagon.uasset differ diff --git a/Content/Blueprints/World/Weather/MySunSky.uasset b/Content/Blueprints/World/Weather/MySunSky.uasset index aa1570d..515ac2b 100644 Binary files a/Content/Blueprints/World/Weather/MySunSky.uasset and b/Content/Blueprints/World/Weather/MySunSky.uasset differ diff --git a/Content/Maps/MainScene.umap b/Content/Maps/MainScene.umap index bc5ba48..1c0bf16 100644 Binary files a/Content/Maps/MainScene.umap and b/Content/Maps/MainScene.umap differ diff --git a/Content/Maps/MainScene_BuiltData.uasset b/Content/Maps/MainScene_BuiltData.uasset index f7167a1..458f5b3 100644 Binary files a/Content/Maps/MainScene_BuiltData.uasset and b/Content/Maps/MainScene_BuiltData.uasset differ diff --git a/Content/Maps/start.umap b/Content/Maps/start.umap index 895614b..a8640a8 100644 Binary files a/Content/Maps/start.umap and b/Content/Maps/start.umap differ diff --git a/Content/Materials/M_Ghost.uasset b/Content/Materials/M_Ghost.uasset index 358d19d..8f1e617 100644 Binary files a/Content/Materials/M_Ghost.uasset and b/Content/Materials/M_Ghost.uasset differ diff --git a/Content/Materials/Masters/MM_Opaque.uasset b/Content/Materials/Masters/MM_Opaque.uasset index 3b13ce5..4af1e60 100644 Binary files a/Content/Materials/Masters/MM_Opaque.uasset and b/Content/Materials/Masters/MM_Opaque.uasset differ diff --git a/Content/Textures/LUT_Tables/LUT_BleachBypass.uasset b/Content/Textures/LUT_Tables/LUT_BleachBypass.uasset new file mode 100644 index 0000000..62592d3 Binary files /dev/null and b/Content/Textures/LUT_Tables/LUT_BleachBypass.uasset differ diff --git a/Content/Textures/LUT_Tables/LUT_CandleLight.uasset b/Content/Textures/LUT_Tables/LUT_CandleLight.uasset new file mode 100644 index 0000000..bc1e807 Binary files /dev/null and b/Content/Textures/LUT_Tables/LUT_CandleLight.uasset differ diff --git a/Content/Textures/LUT_Tables/LUT_CoolContrast.uasset b/Content/Textures/LUT_Tables/LUT_CoolContrast.uasset new file mode 100644 index 0000000..c70d825 Binary files /dev/null and b/Content/Textures/LUT_Tables/LUT_CoolContrast.uasset differ diff --git a/Content/Textures/LUT_Tables/LUT_DesaturatedFog.uasset b/Content/Textures/LUT_Tables/LUT_DesaturatedFog.uasset new file mode 100644 index 0000000..7c11c5d Binary files /dev/null and b/Content/Textures/LUT_Tables/LUT_DesaturatedFog.uasset differ diff --git a/Content/Textures/LUT_Tables/LUT_Evening.uasset b/Content/Textures/LUT_Tables/LUT_Evening.uasset new file mode 100644 index 0000000..ccd457c Binary files /dev/null and b/Content/Textures/LUT_Tables/LUT_Evening.uasset differ diff --git a/Content/Textures/LUT_Tables/LUT_Fall.uasset b/Content/Textures/LUT_Tables/LUT_Fall.uasset new file mode 100644 index 0000000..d65e3f8 Binary files /dev/null and b/Content/Textures/LUT_Tables/LUT_Fall.uasset differ diff --git a/Content/Textures/LUT_Tables/LUT_Filmic.uasset b/Content/Textures/LUT_Tables/LUT_Filmic.uasset new file mode 100644 index 0000000..2154403 Binary files /dev/null and b/Content/Textures/LUT_Tables/LUT_Filmic.uasset differ diff --git a/Content/Textures/LUT_Tables/LUT_Filmic2.uasset b/Content/Textures/LUT_Tables/LUT_Filmic2.uasset new file mode 100644 index 0000000..c13ced9 Binary files /dev/null and b/Content/Textures/LUT_Tables/LUT_Filmic2.uasset differ diff --git a/Content/Textures/LUT_Tables/LUT_Filmic3.uasset b/Content/Textures/LUT_Tables/LUT_Filmic3.uasset new file mode 100644 index 0000000..1018a59 Binary files /dev/null and b/Content/Textures/LUT_Tables/LUT_Filmic3.uasset differ diff --git a/Content/Textures/LUT_Tables/LUT_Filmic4.uasset b/Content/Textures/LUT_Tables/LUT_Filmic4.uasset new file mode 100644 index 0000000..811690d Binary files /dev/null and b/Content/Textures/LUT_Tables/LUT_Filmic4.uasset differ diff --git a/Content/Textures/LUT_Tables/LUT_Filmic5.uasset b/Content/Textures/LUT_Tables/LUT_Filmic5.uasset new file mode 100644 index 0000000..7067baf Binary files /dev/null and b/Content/Textures/LUT_Tables/LUT_Filmic5.uasset differ diff --git a/Content/Textures/LUT_Tables/LUT_Filmic6.uasset b/Content/Textures/LUT_Tables/LUT_Filmic6.uasset new file mode 100644 index 0000000..6f9d69b Binary files /dev/null and b/Content/Textures/LUT_Tables/LUT_Filmic6.uasset differ diff --git a/Content/Textures/LUT_Tables/LUT_Filmic7.uasset b/Content/Textures/LUT_Tables/LUT_Filmic7.uasset new file mode 100644 index 0000000..a173074 Binary files /dev/null and b/Content/Textures/LUT_Tables/LUT_Filmic7.uasset differ diff --git a/Content/Textures/LUT_Tables/LUT_Filmic8.uasset b/Content/Textures/LUT_Tables/LUT_Filmic8.uasset new file mode 100644 index 0000000..a229f11 Binary files /dev/null and b/Content/Textures/LUT_Tables/LUT_Filmic8.uasset differ diff --git a/Content/Textures/LUT_Tables/LUT_Filmic9.uasset b/Content/Textures/LUT_Tables/LUT_Filmic9.uasset new file mode 100644 index 0000000..6dbd1a9 Binary files /dev/null and b/Content/Textures/LUT_Tables/LUT_Filmic9.uasset differ diff --git a/Content/Textures/LUT_Tables/LUT_MatrixBlue.uasset b/Content/Textures/LUT_Tables/LUT_MatrixBlue.uasset new file mode 100644 index 0000000..2e544ae Binary files /dev/null and b/Content/Textures/LUT_Tables/LUT_MatrixBlue.uasset differ diff --git a/Content/Textures/LUT_Tables/LUT_MatrixGreen.uasset b/Content/Textures/LUT_Tables/LUT_MatrixGreen.uasset new file mode 100644 index 0000000..70c0e3c Binary files /dev/null and b/Content/Textures/LUT_Tables/LUT_MatrixGreen.uasset differ diff --git a/Content/Textures/LUT_Tables/LUT_Night1.uasset b/Content/Textures/LUT_Tables/LUT_Night1.uasset new file mode 100644 index 0000000..d2021c9 Binary files /dev/null and b/Content/Textures/LUT_Tables/LUT_Night1.uasset differ diff --git a/Content/Textures/LUT_Tables/LUT_Night2.uasset b/Content/Textures/LUT_Tables/LUT_Night2.uasset new file mode 100644 index 0000000..1128ec6 Binary files /dev/null and b/Content/Textures/LUT_Tables/LUT_Night2.uasset differ diff --git a/Content/Textures/LUT_Tables/LUT_Night_Dark.uasset b/Content/Textures/LUT_Tables/LUT_Night_Dark.uasset new file mode 100644 index 0000000..05cdf78 Binary files /dev/null and b/Content/Textures/LUT_Tables/LUT_Night_Dark.uasset differ diff --git a/Content/Textures/LUT_Tables/LUT_StrongAmber.uasset b/Content/Textures/LUT_Tables/LUT_StrongAmber.uasset new file mode 100644 index 0000000..96566fa Binary files /dev/null and b/Content/Textures/LUT_Tables/LUT_StrongAmber.uasset differ diff --git a/Content/Textures/LUT_Tables/LUT_Warm.uasset b/Content/Textures/LUT_Tables/LUT_Warm.uasset new file mode 100644 index 0000000..3a5eab4 Binary files /dev/null and b/Content/Textures/LUT_Tables/LUT_Warm.uasset differ diff --git a/Content/Textures/LUT_Tables/LUT_WarmContrast.uasset b/Content/Textures/LUT_Tables/LUT_WarmContrast.uasset new file mode 100644 index 0000000..ad44ed9 Binary files /dev/null and b/Content/Textures/LUT_Tables/LUT_WarmContrast.uasset differ diff --git a/DJDPersonal — ярлык.lnk b/DJDPersonal — ярлык.lnk deleted file mode 100644 index 29e6e6a..0000000 Binary files a/DJDPersonal — ярлык.lnk and /dev/null differ diff --git a/DJDPersonal.uproject b/DJDPersonal.uproject index 842b113..ffeda21 100644 --- a/DJDPersonal.uproject +++ b/DJDPersonal.uproject @@ -231,15 +231,6 @@ "Name": "SubversionSourceControl", "Enabled": false }, - { - "Name": "OculusVR", - "Enabled": false, - "SupportedTargetPlatforms": [ - "Win32", - "Win64", - "Android" - ] - }, { "Name": "BlueprintFileUtils", "Enabled": true @@ -261,6 +252,15 @@ "Name": "BlueprintJson", "Enabled": true, "MarketplaceURL": "com.epicgames.launcher://ue/marketplace/content/f837e4835fbc434a853fe1ead2410b84" + }, + { + "Name": "OculusVR", + "Enabled": false, + "SupportedTargetPlatforms": [ + "Win32", + "Win64", + "Android" + ] } ], "TargetPlatforms": [ diff --git a/worldConfig.ini b/worldConfig.ini new file mode 100644 index 0000000..b6802ff --- /dev/null +++ b/worldConfig.ini @@ -0,0 +1,7 @@ +serverIP=127.0.0.1 +serverPort=6000 +hostID=1 +showDebug=false +launchDelay=2 +updateDelta=0.1 +playerId=2 \ No newline at end of file