Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis

Browse Source

...

This commit is contained in:

PC-G13

2022-07-04 13:51:49 +05:00

parent c6d703b09b 6c270ef1e6

commit d3f31241b4

58 changed files with 144 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Content/Blueprints/Library/BP_FunctionLibrary.uasset

BIN

Binary file not shown.

Content/Blueprints/Managers/BP_Controller.uasset

BIN

Binary file not shown.

Content/Blueprints/Managers/BP_GameInstance.uasset

BIN

Binary file not shown.

Content/Blueprints/Player/BP_PlayerStateManager.uasset

BIN

Binary file not shown.

Content/Blueprints/Startup/BP_ControllerStartupLevel.uasset

BIN

Binary file not shown.

Content/Blueprints/Statisctics/BP_Statistics.uasset

BIN

Binary file not shown.

Content/Blueprints/Structures/Struct_ButtonsBackRC.uasset

BIN

Binary file not shown.

Content/HUD/Blueprints/BP_UIStateManager.uasset

BIN

Binary file not shown.

Content/HUD/Templates/UW_InputBox.uasset

BIN

Binary file not shown.

Content/HUD/Templates/UW_TemplateButton.uasset

BIN

Binary file not shown.

Content/HUD/Textures/Blocks/All/BackKey_fortis.uasset

BIN

Binary file not shown.

Content/HUD/Textures/Blocks/All/ButtonBack/ButtonBackDefault_fortis.uasset

BIN

Binary file not shown.

Content/HUD/Textures/Blocks/All/ButtonBack/ButtonBackDisabled_fortis.uasset

BIN

Binary file not shown.

Content/HUD/Textures/Blocks/All/ButtonBack/ButtonBackHovered_fortis.uasset

BIN

Binary file not shown.

Content/HUD/Textures/Blocks/All/ButtonBack/ButtonBackPressed_fortis.uasset

BIN

Binary file not shown.

Content/HUD/Textures/Blocks/All/IconEnter_fortis.uasset

BIN

Binary file not shown.

Content/HUD/Textures/Blocks/All/IconNetwork_fortis.uasset

BIN

Binary file not shown.

Content/HUD/Textures/Blocks/All/KeyboardBackground_fortis.uasset

BIN

Binary file not shown.

Content/HUD/Textures/Blocks/All/UpArrow_fortis.uasset

BIN

Binary file not shown.

Content/HUD/Textures/Examples/All/Example_Keyboard.uasset

BIN

Binary file not shown.

Content/HUD/Textures/Examples/All/Example_Keyboard_En.uasset

BIN

Binary file not shown.

Content/HUD/Widgets/UW_About.uasset

BIN

Binary file not shown.

Content/HUD/Widgets/UW_Elevator.uasset

BIN

Binary file not shown.

Content/HUD/Widgets/UW_FilterFlatCard.uasset

BIN

Binary file not shown.

Content/HUD/Widgets/UW_FilterFlatPanel.uasset

BIN

Binary file not shown.

Content/HUD/Widgets/UW_FlatCardAdvanced.uasset

BIN

Binary file not shown.

Content/HUD/Widgets/UW_FlatCardVR.uasset

BIN

Binary file not shown.

Content/HUD/Widgets/UW_Information.uasset

BIN

Binary file not shown.

Content/HUD/Widgets/UW_Infrastructure.uasset

BIN

Binary file not shown.

Content/HUD/Widgets/UW_Keyboard.uasset

BIN

Binary file not shown.

Content/HUD/Widgets/UW_LoginGeneral.uasset

BIN

Binary file not shown.

Content/HUD/Widgets/UW_LoginPage.uasset

BIN

Binary file not shown.

Content/HUD/Widgets/UW_Main.uasset

BIN

Binary file not shown.

Content/HUD/Widgets/UW_MainWindowVR.uasset

BIN

Binary file not shown.

Content/HUD/Widgets/UW_MenuFlat.uasset

BIN

Binary file not shown.

Content/HUD/Widgets/UW_NavigationButtons.uasset

BIN

Binary file not shown.

Content/HUD/Widgets/UW_NavigationVR.uasset

BIN

Binary file not shown.

Content/HUD/Widgets/UW_Overview.uasset

BIN

Binary file not shown.

Content/HUD/Widgets/UW_Presentation.uasset

BIN

Binary file not shown.

Content/HUD/Widgets/UW_RCSelection.uasset

BIN

Binary file not shown.

Content/HUD/Widgets/UW_SelectHouseVR.uasset

BIN

Binary file not shown.

Content/HUD/Widgets/UW_SendOrPrint.uasset

BIN

Binary file not shown.

Content/HUD/Widgets/UW_WelcomeUser.uasset

BIN

Binary file not shown.

Content/Maps/L_Test.umap

BIN

Binary file not shown.

Content/Test/models/M_H.uasset

BIN

Binary file not shown.

Content/Test/models/M_W.uasset

BIN

Binary file not shown.

Content/Test/models/Water_MaterialC.uasset

BIN

Binary file not shown.

Content/Test/models/Water_Material_CustomMesh.uasset

BIN

Binary file not shown.

Content/Test/models/fixedBoat_inside.uasset

BIN

Binary file not shown.

Content/Test/models/fixedBoat_outside.uasset

BIN

Binary file not shown.