diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 8de90bc..9121839 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -1,4 +1,8 @@ +[Voice] +bEnabled=true +[OnlineSubsystem] +bHasVoiceEnabled=true [/Script/HardwareTargeting.HardwareTargetingSettings] TargetedHardwareClass=Desktop diff --git a/Config/DefaultGame.ini b/Config/DefaultGame.ini index 593d8cb..d0ac5c8 100644 --- a/Config/DefaultGame.ini +++ b/Config/DefaultGame.ini @@ -5,3 +5,5 @@ ProjectID=F53A199F4510F4FB800A37BAC6575029 [/Script/UnrealEd.ProjectPackagingSettings] IncludePrerequisites=False +[/Script/Engine.GameSession] +bRequiresPushToTalk=true \ No newline at end of file diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index 2409d13..3f6eef1 100644 --- a/Config/DefaultInput.ini +++ b/Config/DefaultInput.ini @@ -85,6 +85,8 @@ DoubleClickTime=0.200000 +ActionMappings=(ActionName="TriggerL",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Vive_Left_Trackpad_Click) +ActionMappings=(ActionName="SelectEquipL",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Vive_Left_Grip_Click) +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_Right_Grip_Click) ++ActionMappings=(ActionName="Voice",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Vive_Left_Grip_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) diff --git a/Content/Asset/Geometry/BellBenchLamp/BP_lamp.uasset b/Content/Asset/Geometry/BellBenchLamp/BP_lamp.uasset index 314553c..6e6e664 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/Railway/Vagon/SM_Cart_Damages_SM_Brake.uasset b/Content/Asset/Railway/Vagon/SM_Cart_Damages_SM_Brake.uasset index 91d31e1..98906e8 100644 Binary files a/Content/Asset/Railway/Vagon/SM_Cart_Damages_SM_Brake.uasset and b/Content/Asset/Railway/Vagon/SM_Cart_Damages_SM_Brake.uasset differ diff --git a/Content/Asset/Railway/Vagon/SM_Cart_Damages_SM_Cap.uasset b/Content/Asset/Railway/Vagon/SM_Cart_Damages_SM_Cap.uasset index 0d4ede4..0a4f043 100644 Binary files a/Content/Asset/Railway/Vagon/SM_Cart_Damages_SM_Cap.uasset and b/Content/Asset/Railway/Vagon/SM_Cart_Damages_SM_Cap.uasset differ diff --git a/Content/Asset/Railway/Vagon/SM_Cart_Damages_SM_Cap_Kink_Crack01.uasset b/Content/Asset/Railway/Vagon/SM_Cart_Damages_SM_Cap_Kink_Crack01.uasset index db92b20..610b2b6 100644 Binary files a/Content/Asset/Railway/Vagon/SM_Cart_Damages_SM_Cap_Kink_Crack01.uasset and b/Content/Asset/Railway/Vagon/SM_Cart_Damages_SM_Cap_Kink_Crack01.uasset differ diff --git a/Content/Asset/Railway/Vagon/SM_Cart_Damages_SM_Cap_Kink_Crack02.uasset b/Content/Asset/Railway/Vagon/SM_Cart_Damages_SM_Cap_Kink_Crack02.uasset index 889cab9..cf654f7 100644 Binary files a/Content/Asset/Railway/Vagon/SM_Cart_Damages_SM_Cap_Kink_Crack02.uasset and b/Content/Asset/Railway/Vagon/SM_Cart_Damages_SM_Cap_Kink_Crack02.uasset differ diff --git a/Content/Asset/Railway/Vagon/SM_Cart_Damages_SM_Spring.uasset b/Content/Asset/Railway/Vagon/SM_Cart_Damages_SM_Spring.uasset index 8311ec4..297d6ea 100644 Binary files a/Content/Asset/Railway/Vagon/SM_Cart_Damages_SM_Spring.uasset and b/Content/Asset/Railway/Vagon/SM_Cart_Damages_SM_Spring.uasset differ diff --git a/Content/Asset/Railway/Vagon/SM_Cart_Damages_SM_Spring_Kink01.uasset b/Content/Asset/Railway/Vagon/SM_Cart_Damages_SM_Spring_Kink01.uasset index e071539..0af8875 100644 Binary files a/Content/Asset/Railway/Vagon/SM_Cart_Damages_SM_Spring_Kink01.uasset and b/Content/Asset/Railway/Vagon/SM_Cart_Damages_SM_Spring_Kink01.uasset differ diff --git a/Content/Asset/Railway/Vagon/SM_Cart_Damages_SM_Spring_Kink02.uasset b/Content/Asset/Railway/Vagon/SM_Cart_Damages_SM_Spring_Kink02.uasset index ede6580..f0e4a47 100644 Binary files a/Content/Asset/Railway/Vagon/SM_Cart_Damages_SM_Spring_Kink02.uasset and b/Content/Asset/Railway/Vagon/SM_Cart_Damages_SM_Spring_Kink02.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 52fe2fe..74bb1e0 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/Sculptures/SM_snail_Blueprint.uasset b/Content/Asset/Sculptures/SM_snail_Blueprint.uasset index c9b44b3..cec20ee 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/Streetlight/BP_streetLight.uasset b/Content/Asset/Streetlight/BP_streetLight.uasset new file mode 100644 index 0000000..cc07799 Binary files /dev/null and b/Content/Asset/Streetlight/BP_streetLight.uasset differ diff --git a/Content/Asset/Streetlight/BP_streetLight1.uasset b/Content/Asset/Streetlight/BP_streetLight1.uasset new file mode 100644 index 0000000..b09a36d Binary files /dev/null and b/Content/Asset/Streetlight/BP_streetLight1.uasset differ diff --git a/Content/Asset/Streetlight/BP_streetLight_d.uasset b/Content/Asset/Streetlight/BP_streetLight_d.uasset new file mode 100644 index 0000000..28c0fe3 Binary files /dev/null and b/Content/Asset/Streetlight/BP_streetLight_d.uasset differ diff --git a/Content/Asset/Streetlight/SM_StreetLightDouble.uasset b/Content/Asset/Streetlight/SM_StreetLightDouble.uasset index c94200e..aa251f9 100644 Binary files a/Content/Asset/Streetlight/SM_StreetLightDouble.uasset and b/Content/Asset/Streetlight/SM_StreetLightDouble.uasset differ diff --git a/Content/Asset/Streetlight/SM_StreetLightSingle.uasset b/Content/Asset/Streetlight/SM_StreetLightSingle.uasset index d5e060e..3a6ccc3 100644 Binary files a/Content/Asset/Streetlight/SM_StreetLightSingle.uasset and b/Content/Asset/Streetlight/SM_StreetLightSingle.uasset differ diff --git a/Content/Asset/Streetlight/Stolb.uasset b/Content/Asset/Streetlight/Stolb.uasset new file mode 100644 index 0000000..f1d7d99 Binary files /dev/null and b/Content/Asset/Streetlight/Stolb.uasset differ diff --git a/Content/AssetPacks/CarMoveSpline/BP/BP_CarSpline.uasset b/Content/AssetPacks/CarMoveSpline/BP/BP_CarSpline.uasset index 05f96e3..8db468d 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 550dbf9..50bd7f6 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/CarMoveSpline/Materials/M_Light.uasset b/Content/AssetPacks/CarMoveSpline/Materials/M_Light.uasset index 7d98083..7d97377 100644 Binary files a/Content/AssetPacks/CarMoveSpline/Materials/M_Light.uasset and b/Content/AssetPacks/CarMoveSpline/Materials/M_Light.uasset differ diff --git a/Content/Blueprints/BP_Vagon.uasset b/Content/Blueprints/BP_Vagon.uasset index 4d721a7..c7d1481 100644 Binary files a/Content/Blueprints/BP_Vagon.uasset and b/Content/Blueprints/BP_Vagon.uasset differ diff --git a/Content/Blueprints/Player/VR/BP_Hammer.uasset b/Content/Blueprints/Player/VR/BP_Hammer.uasset index 427c92e..6a60f74 100644 Binary files a/Content/Blueprints/Player/VR/BP_Hammer.uasset and b/Content/Blueprints/Player/VR/BP_Hammer.uasset differ diff --git a/Content/Blueprints/Player/myPC.uasset b/Content/Blueprints/Player/myPC.uasset index cccda8a..b17a3cc 100644 Binary files a/Content/Blueprints/Player/myPC.uasset and b/Content/Blueprints/Player/myPC.uasset differ diff --git a/Content/Blueprints/World/Weather/BPI_daytime.uasset b/Content/Blueprints/World/Weather/BPI_daytime.uasset new file mode 100644 index 0000000..53d8db4 Binary files /dev/null and b/Content/Blueprints/World/Weather/BPI_daytime.uasset differ diff --git a/Content/Blueprints/World/Weather/MySunSky.uasset b/Content/Blueprints/World/Weather/MySunSky.uasset index 65ee617..ec87a0f 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 d7c6dc1..4e1d3d4 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 93cfe67..baa2790 100644 Binary files a/Content/Maps/MainScene_BuiltData.uasset and b/Content/Maps/MainScene_BuiltData.uasset differ diff --git a/Content/Sounds/hitAttenuation.uasset b/Content/Sounds/hitAttenuation.uasset new file mode 100644 index 0000000..a0b18e8 Binary files /dev/null and b/Content/Sounds/hitAttenuation.uasset differ diff --git a/DJDPersonal.uproject b/DJDPersonal.uproject index 7b85a1e..842b113 100644 --- a/DJDPersonal.uproject +++ b/DJDPersonal.uproject @@ -3,6 +3,13 @@ "EngineAssociation": "4.25", "Category": "", "Description": "", + "Modules": [ + { + "Name": "DJDPersonal", + "Type": "Runtime", + "LoadingPhase": "Default" + } + ], "Plugins": [ { "Name": "Paper2D", @@ -233,6 +240,10 @@ "Android" ] }, + { + "Name": "BlueprintFileUtils", + "Enabled": true + }, { "Name": "WebBrowserWidget", "Enabled": true @@ -241,6 +252,11 @@ "Name": "SunPosition", "Enabled": true }, + { + "Name": "Restart", + "Enabled": true, + "MarketplaceURL": "com.epicgames.launcher://ue/marketplace/product/1bf89025ddf246e3af3c196d0426e0d3" + }, { "Name": "BlueprintJson", "Enabled": true,