diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 2b0e774..68dc207 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -2,7 +2,7 @@ +ActiveGameNameRedirects=(OldGameName="TP_BlankBP",NewGameName="/Script/railwayWorker") +ActiveGameNameRedirects=(OldGameName="/Script/TP_BlankBP",NewGameName="/Script/railwayWorker") bUseFixedFrameRate=True -FixedFrameRate=60.000000 +FixedFrameRate=30.000000 NearClipPlane=1.000000 bCanBlueprintsTickByDefault=False @@ -123,8 +123,8 @@ GlobalDefaultGameMode=/Game/test/Blueprints/gamemodes/gameModeRailwayCarriage.ga <<<<<<< Updated upstream [/Script/Engine.UserInterfaceSettings] -UIScaleRule=Vertical -UIScaleCurve=(EditorCurveData=(Keys=((Time=1920.000000,Value=1.000000)),DefaultValue=340282346638528859811704183484516925440.000000,PreInfinityExtrap=RCCE_Constant,PostInfinityExtrap=RCCE_Constant),ExternalCurve=None) +UIScaleRule=ShortestSide +UIScaleCurve=(EditorCurveData=(Keys=((Time=480.000000,Value=0.440000),(Time=720.000000,Value=0.660000),(Time=1080.000000,Value=1.000000),(Time=8640.000000,Value=8.000000)),DefaultValue=340282346638528859811704183484516925440.000000,PreInfinityExtrap=RCCE_Constant,PostInfinityExtrap=RCCE_Constant),ExternalCurve=None) ======= >>>>>>> Stashed changes diff --git a/Config/DefaultGame.ini b/Config/DefaultGame.ini index 080064d..1d22f40 100644 --- a/Config/DefaultGame.ini +++ b/Config/DefaultGame.ini @@ -2,5 +2,5 @@ [/Script/EngineSettings.GeneralProjectSettings] ProjectID=2F31DBBE41464D2BEC5D7796DE9D22E9 -bStartInVR=True +bStartInVR=False diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index 3a6fdce..dd047fd 100644 Binary files a/Config/DefaultInput.ini and b/Config/DefaultInput.ini differ diff --git a/Content/AssetPacks/TB/BasicGeometry/NewTrains/21_-_defaultm_on.uasset b/Content/AssetPacks/TB/BasicGeometry/NewTrains/21_-_defaultm_on.uasset index a77ca8c..907f07a 100644 Binary files a/Content/AssetPacks/TB/BasicGeometry/NewTrains/21_-_defaultm_on.uasset and b/Content/AssetPacks/TB/BasicGeometry/NewTrains/21_-_defaultm_on.uasset differ diff --git a/Content/AssetPacks/TB/BasicGeometry/NewTrains/21_-_defaultm_on_Inst.uasset b/Content/AssetPacks/TB/BasicGeometry/NewTrains/21_-_defaultm_on_Inst.uasset new file mode 100644 index 0000000..4562285 Binary files /dev/null and b/Content/AssetPacks/TB/BasicGeometry/NewTrains/21_-_defaultm_on_Inst.uasset differ diff --git a/Content/AssetPacks/TB/BasicGeometry/NewTrains/NewTrain_12.uasset b/Content/AssetPacks/TB/BasicGeometry/NewTrains/NewTrain_12.uasset index 80045fb..51cbf17 100644 Binary files a/Content/AssetPacks/TB/BasicGeometry/NewTrains/NewTrain_12.uasset and b/Content/AssetPacks/TB/BasicGeometry/NewTrains/NewTrain_12.uasset differ diff --git a/Content/AssetPacks/TB/Maps/VokzalMap.umap b/Content/AssetPacks/TB/Maps/VokzalMap.umap index 6aa9934..34a73e9 100644 Binary files a/Content/AssetPacks/TB/Maps/VokzalMap.umap and b/Content/AssetPacks/TB/Maps/VokzalMap.umap differ diff --git a/Content/AssetPacks/TB/MyFunctionalBlueprints/ColorBox/ColorBox.uasset b/Content/AssetPacks/TB/MyFunctionalBlueprints/ColorBox/ColorBox.uasset deleted file mode 100644 index 9f13825..0000000 Binary files a/Content/AssetPacks/TB/MyFunctionalBlueprints/ColorBox/ColorBox.uasset and /dev/null differ diff --git a/Content/AssetPacks/TB/MyFunctionalBlueprints/ColorBox/ColorBoxWidget.uasset b/Content/AssetPacks/TB/MyFunctionalBlueprints/ColorBox/ColorBoxWidget.uasset deleted file mode 100644 index 7b030e0..0000000 Binary files a/Content/AssetPacks/TB/MyFunctionalBlueprints/ColorBox/ColorBoxWidget.uasset and /dev/null differ diff --git a/Content/AssetPacks/TB/MyFunctionalBlueprints/ColorBox/ColorObjectWidget.uasset b/Content/AssetPacks/TB/MyFunctionalBlueprints/ColorBox/ColorObjectWidget.uasset deleted file mode 100644 index 7572e5b..0000000 Binary files a/Content/AssetPacks/TB/MyFunctionalBlueprints/ColorBox/ColorObjectWidget.uasset and /dev/null differ diff --git a/Content/AssetPacks/TB/MyFunctionalBlueprints/ColorBox/Object1.uasset b/Content/AssetPacks/TB/MyFunctionalBlueprints/ColorBox/Object1.uasset deleted file mode 100644 index ed35736..0000000 Binary files a/Content/AssetPacks/TB/MyFunctionalBlueprints/ColorBox/Object1.uasset and /dev/null differ diff --git a/Content/AssetPacks/TB/MyFunctionalBlueprints/ColorBox/ShowLVL.uasset b/Content/AssetPacks/TB/MyFunctionalBlueprints/ColorBox/ShowLVL.uasset deleted file mode 100644 index b71f779..0000000 Binary files a/Content/AssetPacks/TB/MyFunctionalBlueprints/ColorBox/ShowLVL.uasset and /dev/null differ diff --git a/Content/AssetPacks/TB/MyFunctionalBlueprints/InformationButtons/IformationScenes.uasset b/Content/AssetPacks/TB/MyFunctionalBlueprints/InformationButtons/IformationScenes.uasset deleted file mode 100644 index 8007121..0000000 Binary files a/Content/AssetPacks/TB/MyFunctionalBlueprints/InformationButtons/IformationScenes.uasset and /dev/null differ diff --git a/Content/Materials/Instances/MD_BigCrack.uasset b/Content/Materials/Instances/MD_BigCrack.uasset index c5e2aaf..d9bcf43 100644 Binary files a/Content/Materials/Instances/MD_BigCrack.uasset and b/Content/Materials/Instances/MD_BigCrack.uasset differ diff --git a/Content/Materials/Instances/MD_Crack.uasset b/Content/Materials/Instances/MD_Crack.uasset index 9eb385c..8436b07 100644 Binary files a/Content/Materials/Instances/MD_Crack.uasset and b/Content/Materials/Instances/MD_Crack.uasset differ diff --git a/Content/Materials/Instances/MD_DMG.uasset b/Content/Materials/Instances/MD_DMG.uasset index 097c27a..7eb210e 100644 Binary files a/Content/Materials/Instances/MD_DMG.uasset and b/Content/Materials/Instances/MD_DMG.uasset differ diff --git a/Content/test/Blueprints/RailwayCarriages/BP_RailwayCarriage.uasset b/Content/test/Blueprints/RailwayCarriages/BP_RailwayCarriage.uasset index ae95039..f9dec83 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 19f8f1a..be80935 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 7d8b508..7ba7097 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 b8eb25f..d43c86e 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 a94dba1..1119ad2 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 1b287c9..aeaea4d 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 7e9fa5b..3b54d93 100644 Binary files a/Content/test/Levels/Main.umap and b/Content/test/Levels/Main.umap differ diff --git a/Content/test/Meshes/Gloves/Gloves.uasset b/Content/test/Meshes/Gloves/Gloves.uasset index 0233404..d9f40a8 100644 Binary files a/Content/test/Meshes/Gloves/Gloves.uasset and b/Content/test/Meshes/Gloves/Gloves.uasset differ diff --git a/Content/test/UI/MAinMEnu/UI_MainMenu.uasset b/Content/test/UI/MAinMEnu/UI_MainMenu.uasset index e7d38b3..3f131a6 100644 Binary files a/Content/test/UI/MAinMEnu/UI_MainMenu.uasset and b/Content/test/UI/MAinMEnu/UI_MainMenu.uasset differ diff --git a/Content/test/UI/MAinMEnu/images/0.uasset b/Content/test/UI/MAinMEnu/images/0.uasset new file mode 100644 index 0000000..43670d6 Binary files /dev/null and b/Content/test/UI/MAinMEnu/images/0.uasset differ diff --git a/Content/test/UI/MAinMEnu/images/0_act.uasset b/Content/test/UI/MAinMEnu/images/0_act.uasset new file mode 100644 index 0000000..26babf9 Binary files /dev/null and b/Content/test/UI/MAinMEnu/images/0_act.uasset differ diff --git a/Content/test/UI/MAinMEnu/images/1.uasset b/Content/test/UI/MAinMEnu/images/1.uasset new file mode 100644 index 0000000..4d66755 Binary files /dev/null and b/Content/test/UI/MAinMEnu/images/1.uasset differ diff --git a/Content/test/UI/MAinMEnu/images/10.uasset b/Content/test/UI/MAinMEnu/images/10.uasset new file mode 100644 index 0000000..b2c02f4 Binary files /dev/null and b/Content/test/UI/MAinMEnu/images/10.uasset differ diff --git a/Content/test/UI/MAinMEnu/images/10_act.uasset b/Content/test/UI/MAinMEnu/images/10_act.uasset new file mode 100644 index 0000000..16f908a Binary files /dev/null and b/Content/test/UI/MAinMEnu/images/10_act.uasset differ diff --git a/Content/test/UI/MAinMEnu/images/11.uasset b/Content/test/UI/MAinMEnu/images/11.uasset new file mode 100644 index 0000000..3a76b4e Binary files /dev/null and b/Content/test/UI/MAinMEnu/images/11.uasset differ diff --git a/Content/test/UI/MAinMEnu/images/11_act.uasset b/Content/test/UI/MAinMEnu/images/11_act.uasset new file mode 100644 index 0000000..986f275 Binary files /dev/null and b/Content/test/UI/MAinMEnu/images/11_act.uasset differ diff --git a/Content/test/UI/MAinMEnu/images/12.uasset b/Content/test/UI/MAinMEnu/images/12.uasset new file mode 100644 index 0000000..9fb1618 Binary files /dev/null and b/Content/test/UI/MAinMEnu/images/12.uasset differ diff --git a/Content/test/UI/MAinMEnu/images/12_act.uasset b/Content/test/UI/MAinMEnu/images/12_act.uasset new file mode 100644 index 0000000..d9c2549 Binary files /dev/null and b/Content/test/UI/MAinMEnu/images/12_act.uasset differ diff --git a/Content/test/UI/MAinMEnu/images/13.uasset b/Content/test/UI/MAinMEnu/images/13.uasset new file mode 100644 index 0000000..048ff5c Binary files /dev/null and b/Content/test/UI/MAinMEnu/images/13.uasset differ diff --git a/Content/test/UI/MAinMEnu/images/13_act.uasset b/Content/test/UI/MAinMEnu/images/13_act.uasset new file mode 100644 index 0000000..5c26433 Binary files /dev/null and b/Content/test/UI/MAinMEnu/images/13_act.uasset differ diff --git a/Content/test/UI/MAinMEnu/images/14.uasset b/Content/test/UI/MAinMEnu/images/14.uasset new file mode 100644 index 0000000..4df00fe Binary files /dev/null and b/Content/test/UI/MAinMEnu/images/14.uasset differ diff --git a/Content/test/UI/MAinMEnu/images/14_act.uasset b/Content/test/UI/MAinMEnu/images/14_act.uasset new file mode 100644 index 0000000..952b789 Binary files /dev/null and b/Content/test/UI/MAinMEnu/images/14_act.uasset differ diff --git a/Content/test/UI/MAinMEnu/images/1_act.uasset b/Content/test/UI/MAinMEnu/images/1_act.uasset new file mode 100644 index 0000000..8b19c87 Binary files /dev/null and b/Content/test/UI/MAinMEnu/images/1_act.uasset differ diff --git a/Content/test/UI/MAinMEnu/images/2.uasset b/Content/test/UI/MAinMEnu/images/2.uasset new file mode 100644 index 0000000..733c709 Binary files /dev/null and b/Content/test/UI/MAinMEnu/images/2.uasset differ diff --git a/Content/test/UI/MAinMEnu/images/2_act.uasset b/Content/test/UI/MAinMEnu/images/2_act.uasset new file mode 100644 index 0000000..0a7de79 Binary files /dev/null and b/Content/test/UI/MAinMEnu/images/2_act.uasset differ diff --git a/Content/test/UI/MAinMEnu/images/3.uasset b/Content/test/UI/MAinMEnu/images/3.uasset new file mode 100644 index 0000000..475418e Binary files /dev/null and b/Content/test/UI/MAinMEnu/images/3.uasset differ diff --git a/Content/test/UI/MAinMEnu/images/3_act.uasset b/Content/test/UI/MAinMEnu/images/3_act.uasset new file mode 100644 index 0000000..440686b Binary files /dev/null and b/Content/test/UI/MAinMEnu/images/3_act.uasset differ diff --git a/Content/test/UI/MAinMEnu/images/4.uasset b/Content/test/UI/MAinMEnu/images/4.uasset new file mode 100644 index 0000000..b065b02 Binary files /dev/null and b/Content/test/UI/MAinMEnu/images/4.uasset differ diff --git a/Content/test/UI/MAinMEnu/images/4_act.uasset b/Content/test/UI/MAinMEnu/images/4_act.uasset new file mode 100644 index 0000000..cdf682f Binary files /dev/null and b/Content/test/UI/MAinMEnu/images/4_act.uasset differ diff --git a/Content/test/UI/MAinMEnu/images/5.uasset b/Content/test/UI/MAinMEnu/images/5.uasset new file mode 100644 index 0000000..17a7681 Binary files /dev/null and b/Content/test/UI/MAinMEnu/images/5.uasset differ diff --git a/Content/test/UI/MAinMEnu/images/5_act.uasset b/Content/test/UI/MAinMEnu/images/5_act.uasset new file mode 100644 index 0000000..ee41a8d Binary files /dev/null and b/Content/test/UI/MAinMEnu/images/5_act.uasset differ diff --git a/Content/test/UI/MAinMEnu/images/6.uasset b/Content/test/UI/MAinMEnu/images/6.uasset new file mode 100644 index 0000000..4e71fec Binary files /dev/null and b/Content/test/UI/MAinMEnu/images/6.uasset differ diff --git a/Content/test/UI/MAinMEnu/images/6_act.uasset b/Content/test/UI/MAinMEnu/images/6_act.uasset new file mode 100644 index 0000000..f2a6404 Binary files /dev/null and b/Content/test/UI/MAinMEnu/images/6_act.uasset differ diff --git a/Content/test/UI/MAinMEnu/images/7.uasset b/Content/test/UI/MAinMEnu/images/7.uasset new file mode 100644 index 0000000..957b994 Binary files /dev/null and b/Content/test/UI/MAinMEnu/images/7.uasset differ diff --git a/Content/test/UI/MAinMEnu/images/7_act.uasset b/Content/test/UI/MAinMEnu/images/7_act.uasset new file mode 100644 index 0000000..07473bd Binary files /dev/null and b/Content/test/UI/MAinMEnu/images/7_act.uasset differ diff --git a/Content/test/UI/MAinMEnu/images/8.uasset b/Content/test/UI/MAinMEnu/images/8.uasset new file mode 100644 index 0000000..0293711 Binary files /dev/null and b/Content/test/UI/MAinMEnu/images/8.uasset differ diff --git a/Content/test/UI/MAinMEnu/images/8_act.uasset b/Content/test/UI/MAinMEnu/images/8_act.uasset new file mode 100644 index 0000000..113198d Binary files /dev/null and b/Content/test/UI/MAinMEnu/images/8_act.uasset differ diff --git a/Content/test/UI/MAinMEnu/images/9.uasset b/Content/test/UI/MAinMEnu/images/9.uasset new file mode 100644 index 0000000..1d04dac Binary files /dev/null and b/Content/test/UI/MAinMEnu/images/9.uasset differ diff --git a/Content/test/UI/MAinMEnu/images/9_act.uasset b/Content/test/UI/MAinMEnu/images/9_act.uasset new file mode 100644 index 0000000..74ff87b Binary files /dev/null and b/Content/test/UI/MAinMEnu/images/9_act.uasset differ