diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 67aa4f0..b736803 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -13,9 +13,9 @@ bSupportsLandscapeLeftOrientation=True PreferredLandscapeOrientation=LandscapeLeft [/Script/EngineSettings.GameMapsSettings] -EditorStartupMap=/Game/Levels/Hangar_2.Hangar_2 +EditorStartupMap=/Game/Levels/index.index GameInstanceClass=/Game/Blueprints/Player/GI.GI_C -GameDefaultMap=/Game/Levels/Hangar_2.Hangar_2 +GameDefaultMap=/Game/Levels/index.index bUseSplitscreen=False GlobalDefaultGameMode=/Game/Blueprints/Player/GS.GS_C diff --git a/Content/AdvancedGlassPack/Materials/02_Dirty/M_Glass_DirtyMaster.uasset b/Content/AdvancedGlassPack/Materials/02_Dirty/M_Glass_DirtyMaster.uasset index 0aebf5a..f613f6f 100644 Binary files a/Content/AdvancedGlassPack/Materials/02_Dirty/M_Glass_DirtyMaster.uasset and b/Content/AdvancedGlassPack/Materials/02_Dirty/M_Glass_DirtyMaster.uasset differ diff --git a/Content/Architecture/Warehouse/Building01/SM_MERGED_LightPartFour21_375.uasset b/Content/Architecture/Warehouse/Building01/SM_MERGED_LightPartFour21_375.uasset index f0ca364..c5e5403 100644 Binary files a/Content/Architecture/Warehouse/Building01/SM_MERGED_LightPartFour21_375.uasset and b/Content/Architecture/Warehouse/Building01/SM_MERGED_LightPartFour21_375.uasset differ diff --git a/Content/Assets/Underground_Bunker/Materials/Glass/MI_Glass_illuminated_Cool_01.uasset b/Content/Assets/Underground_Bunker/Materials/Glass/MI_Glass_illuminated_Cool_01.uasset index 64d8504..c4c734c 100644 Binary files a/Content/Assets/Underground_Bunker/Materials/Glass/MI_Glass_illuminated_Cool_01.uasset and b/Content/Assets/Underground_Bunker/Materials/Glass/MI_Glass_illuminated_Cool_01.uasset differ diff --git a/Content/Blueprints/BP_Engine.uasset b/Content/Blueprints/BP_Engine.uasset index f42c717..94fa8fd 100644 Binary files a/Content/Blueprints/BP_Engine.uasset and b/Content/Blueprints/BP_Engine.uasset differ diff --git a/Content/Blueprints/BP_Helicopter.uasset b/Content/Blueprints/BP_Helicopter.uasset index 53509a5..5c2994c 100644 Binary files a/Content/Blueprints/BP_Helicopter.uasset and b/Content/Blueprints/BP_Helicopter.uasset differ diff --git a/Content/Blueprints/BP_Helicopter1.uasset b/Content/Blueprints/BP_Helicopter1.uasset index 93e112b..38836e5 100644 Binary files a/Content/Blueprints/BP_Helicopter1.uasset and b/Content/Blueprints/BP_Helicopter1.uasset differ diff --git a/Content/Blueprints/Player/GS1.uasset b/Content/Blueprints/Player/GS1.uasset index b355cab..abd2e15 100644 Binary files a/Content/Blueprints/Player/GS1.uasset and b/Content/Blueprints/Player/GS1.uasset differ diff --git a/Content/Blueprints/Player/MyPawn.uasset b/Content/Blueprints/Player/MyPawn.uasset index 742d080..36e00ec 100644 Binary files a/Content/Blueprints/Player/MyPawn.uasset and b/Content/Blueprints/Player/MyPawn.uasset differ diff --git a/Content/Blueprints/Player/VR/BP_MotionController.uasset b/Content/Blueprints/Player/VR/BP_MotionController.uasset index 9191c1e..2538887 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/MotionControllerPawn.uasset b/Content/Blueprints/Player/VR/MotionControllerPawn.uasset index d51645a..d8b778f 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/VR/VRPC.uasset b/Content/Blueprints/Player/VR/VRPC.uasset index fa6a760..5826d36 100644 Binary files a/Content/Blueprints/Player/VR/VRPC.uasset and b/Content/Blueprints/Player/VR/VRPC.uasset differ diff --git a/Content/Blueprints/UI/Materials/BigCircleDecal.uasset b/Content/Blueprints/UI/Materials/BigCircleDecal.uasset new file mode 100644 index 0000000..84a2ff1 Binary files /dev/null and b/Content/Blueprints/UI/Materials/BigCircleDecal.uasset differ diff --git a/Content/Blueprints/UI/Materials/WidgetMat1.uasset b/Content/Blueprints/UI/Materials/WidgetMat1.uasset new file mode 100644 index 0000000..125a294 Binary files /dev/null and b/Content/Blueprints/UI/Materials/WidgetMat1.uasset differ diff --git a/Content/Blueprints/UI/Other/Daskboard.uasset b/Content/Blueprints/UI/Other/Daskboard.uasset index 3117c14..4d24e84 100644 Binary files a/Content/Blueprints/UI/Other/Daskboard.uasset and b/Content/Blueprints/UI/Other/Daskboard.uasset differ diff --git a/Content/Blueprints/UI/Wbps/List.uasset b/Content/Blueprints/UI/Wbps/List.uasset index eff5451..e5cb38e 100644 Binary files a/Content/Blueprints/UI/Wbps/List.uasset and b/Content/Blueprints/UI/Wbps/List.uasset differ diff --git a/Content/Blueprints/UI/Wbps/MainMenu.uasset b/Content/Blueprints/UI/Wbps/MainMenu.uasset index 0316b02..601c1f8 100644 Binary files a/Content/Blueprints/UI/Wbps/MainMenu.uasset and b/Content/Blueprints/UI/Wbps/MainMenu.uasset differ diff --git a/Content/Blueprints/UI/Wbps/VRSlate1.uasset b/Content/Blueprints/UI/Wbps/VRSlate1.uasset index 9a6a023..4b8230a 100644 Binary files a/Content/Blueprints/UI/Wbps/VRSlate1.uasset and b/Content/Blueprints/UI/Wbps/VRSlate1.uasset differ diff --git a/Content/Blueprints/UI/Wbps/VRSlate2.uasset b/Content/Blueprints/UI/Wbps/VRSlate2.uasset new file mode 100644 index 0000000..4efe5d2 Binary files /dev/null and b/Content/Blueprints/UI/Wbps/VRSlate2.uasset differ diff --git a/Content/Blueprints/UI/imgs/vive.uasset b/Content/Blueprints/UI/imgs/vive.uasset new file mode 100644 index 0000000..67d2906 Binary files /dev/null and b/Content/Blueprints/UI/imgs/vive.uasset differ diff --git a/Content/Levels/Hangar_2.umap b/Content/Levels/Hangar_2.umap index 92112f0..1c2c239 100644 Binary files a/Content/Levels/Hangar_2.umap and b/Content/Levels/Hangar_2.umap differ diff --git a/Content/Levels/index.umap b/Content/Levels/index.umap index 4128dc8..8f29be9 100644 Binary files a/Content/Levels/index.umap and b/Content/Levels/index.umap differ diff --git a/Content/Materials/Engine/M_Engine.uasset b/Content/Materials/Engine/M_Engine.uasset index a203ba0..c7f12bd 100644 Binary files a/Content/Materials/Engine/M_Engine.uasset and b/Content/Materials/Engine/M_Engine.uasset differ diff --git a/Content/Materials/Engine/M_Engine_Turbine.uasset b/Content/Materials/Engine/M_Engine_Turbine.uasset index ed71832..2e437a3 100644 Binary files a/Content/Materials/Engine/M_Engine_Turbine.uasset and b/Content/Materials/Engine/M_Engine_Turbine.uasset differ diff --git a/Content/Meshes/Engin_2/SM_Engine.uasset b/Content/Meshes/Engin_2/SM_Engine.uasset index 1b00c6d..9d3e29a 100644 Binary files a/Content/Meshes/Engin_2/SM_Engine.uasset and b/Content/Meshes/Engin_2/SM_Engine.uasset differ diff --git a/Content/Meshes/Engin_2/SM_Engine_Cap.uasset b/Content/Meshes/Engin_2/SM_Engine_Cap.uasset index 21939dc..552fdc1 100644 Binary files a/Content/Meshes/Engin_2/SM_Engine_Cap.uasset and b/Content/Meshes/Engin_2/SM_Engine_Cap.uasset differ diff --git a/Content/Meshes/Exterior/SM_AirControl.uasset b/Content/Meshes/Exterior/SM_AirControl.uasset index b3d2eb0..0dd9a4d 100644 Binary files a/Content/Meshes/Exterior/SM_AirControl.uasset and b/Content/Meshes/Exterior/SM_AirControl.uasset differ diff --git a/Content/Meshes/Exterior/SM_FuselageLeft.uasset b/Content/Meshes/Exterior/SM_FuselageLeft.uasset index 73cb1dd..3674ffb 100644 Binary files a/Content/Meshes/Exterior/SM_FuselageLeft.uasset and b/Content/Meshes/Exterior/SM_FuselageLeft.uasset differ diff --git a/Content/VirtualReality/Mannequin/Character/Materials/M_HandMat.uasset b/Content/VirtualReality/Mannequin/Character/Materials/M_HandMat.uasset index 3c2613f..02f3b50 100644 Binary files a/Content/VirtualReality/Mannequin/Character/Materials/M_HandMat.uasset and b/Content/VirtualReality/Mannequin/Character/Materials/M_HandMat.uasset differ diff --git a/Content/VirtualReality/Materials/TeleportMCP.uasset b/Content/VirtualReality/Materials/TeleportMCP.uasset index afec304..9ef58bc 100644 Binary files a/Content/VirtualReality/Materials/TeleportMCP.uasset and b/Content/VirtualReality/Materials/TeleportMCP.uasset differ diff --git a/Helicopter_K52.uproject b/Helicopter_K52.uproject index 377f528..8c46b5d 100644 --- a/Helicopter_K52.uproject +++ b/Helicopter_K52.uproject @@ -13,10 +13,6 @@ "Name": "OculusVR", "Enabled": false }, - { - "Name": "SteamVR", - "Enabled": false - }, { "Name": "AndroidMoviePlayer", "Enabled": false