Andron666
2983182314
Merge branch 'master' into developers
# Conflicts:
# .gitignore
# Config/DefaultInput.ini
# Content/Floors/AreasG/AreaCapG.uasset
# Content/Floors/Floor1/Floor1Cap.uasset
# Content/Floors/Floor3/Floor3Cap.uasset
# Content/Floors/GroundF/GroundFloorCap.uasset
# Content/Maps/Untitled.umap
# Content/Widgets/MainMenu.uasset
# Content/Widgets/SearchResults.uasset
# Content/Widgets/appointments.uasset
# Content/Widgets/infopoints/texture/Bg.uasset
# Content/Widgets/infopoints/texture/Bg120.uasset
# Content/Widgets/infopoints/texture/Btn238GoldRoutePressed.uasset
# Content/Widgets/infopoints/texture/Btn238GoldShow_route.uasset
# Content/Widgets/infopoints/texture/Btn474RouteDefault.uasset
# Content/Widgets/infopoints/texture/Btn474RouteNonActive.uasset
# Content/Widgets/infopoints/texture/Btn474RoutePressed.uasset
# Content/Widgets/infopoints/texture/Btn48Info.uasset
# Content/Widgets/infopoints/texture/Btn48InfoPressed.uasset
# Content/Widgets/infopoints/texture/BtnZoom.uasset
# Content/Widgets/infopoints/texture/Buildings.uasset
# Content/Widgets/infopoints/texture/Close.uasset
# Content/Widgets/infopoints/texture/ImageWaitingArea120.uasset
# Content/Widgets/infopoints/texture/ImageWaitingArea560.uasset
# Content/Widgets/infopoints/texture/Pharmacy40.uasset
# Content/Widgets/infopoints/texture/Pointer.uasset
# Content/Widgets/infopoints/texture/PointerGold.uasset
# Content/Widgets/infopoints/texture/PrayMan.uasset
# Content/Widgets/infopoints/texture/PrayWoman.uasset
# Content/Widgets/infopoints/texture/Reception40.uasset
# Content/Widgets/infopoints/texture/RedClose.uasset
# Content/Widgets/infopoints/texture/RoomModal.uasset
# Content/Widgets/infopoints/texture/RoomModalBg.uasset
# Content/Widgets/infopoints/texture/RoomPhotoBg652.uasset
# Content/Widgets/infopoints/texture/SignElevator.uasset
# Content/Widgets/infopoints/texture/SignYouAreHere.uasset
# Content/Widgets/infopoints/texture/Table.uasset
# Content/Widgets/infopoints/texture/Toilet40Man.uasset
# Content/Widgets/infopoints/texture/Toilet40Woman.uasset
# Content/Widgets/textures/1.uasset
# Content/Widgets/textures/2.uasset
# Content/Widgets/textures/3.uasset
# Content/Widgets/textures/4.uasset
# Content/Widgets/textures/5.uasset
# Content/Widgets/textures/6.uasset
# Content/Widgets/textures/7.uasset
# Content/Widgets/textures/8.uasset
# Content/Widgets/textures/8_2.uasset
# Content/Widgets/textures/ArrowNavBar.uasset
# Content/Widgets/textures/ArrowNotification.uasset
# Content/Widgets/textures/Bg.uasset
# Content/Widgets/textures/BgFloor.uasset
# Content/Widgets/textures/BgFloorUp.uasset
# Content/Widgets/textures/BtAssistance.uasset
# Content/Widgets/textures/BtAssistancePressed.uasset
# Content/Widgets/textures/BtCancel.uasset
# Content/Widgets/textures/BtCancelPressed.uasset
# Content/Widgets/textures/BtDemo.uasset
# Content/Widgets/textures/BtDemoPress.uasset
# Content/Widgets/textures/BtFloorPressed1.uasset
# Content/Widgets/textures/BtFloorPressed1NonActive.uasset
# Content/Widgets/textures/BtFloorPressed2.uasset
# Content/Widgets/textures/BtFloorPressed2NonActive.uasset
# Content/Widgets/textures/BtFloorPressed3.uasset
# Content/Widgets/textures/BtFloorPressed3NonActive.uasset
# Content/Widgets/textures/BtFloorPressed4.uasset
# Content/Widgets/textures/BtFloorPressed4NonActive.uasset
# Content/Widgets/textures/BtFloorPressed5.uasset
# Content/Widgets/textures/BtFloorPressed5NonActive.uasset
# Content/Widgets/textures/BtFloorPressed6.uasset
# Content/Widgets/textures/BtFloorPressed6NonActive.uasset
# Content/Widgets/textures/BtFloorPressed7.uasset
# Content/Widgets/textures/BtFloorPressed7NonActive.uasset
# Content/Widgets/textures/BtFloorPressed8.uasset
# Content/Widgets/textures/BtFloorPressed8NonActive.uasset
# Content/Widgets/textures/BtFloorPressedG.uasset
# Content/Widgets/textures/BtFloorPressedGNonActive.uasset
# Content/Widgets/textures/BtLogIn.uasset
# Content/Widgets/textures/BtLogInPressed.uasset
# Content/Widgets/textures/BtLogOut.uasset
# Content/Widgets/textures/BtLogOutPopUp.uasset
# Content/Widgets/textures/BtLogOutPopUpPressed.uasset
# Content/Widgets/textures/BtLogOutPressed.uasset
# Content/Widgets/textures/BtMenu.uasset
# Content/Widgets/textures/BtMenuPressed.uasset
# Content/Widgets/textures/BtNavigation.uasset
# Content/Widgets/textures/BtNavigationPressed.uasset
# Content/Widgets/textures/BtRecendCode.uasset
# Content/Widgets/textures/BtRecendCodeDisabled.uasset
# Content/Widgets/textures/BtRecendCodePressed.uasset
# Content/Widgets/textures/BtSearch.uasset
# Content/Widgets/textures/BtSearchPressed_.uasset
# Content/Widgets/textures/BtnAppGold.uasset
# Content/Widgets/textures/BtnAppGold_1.uasset
# Content/Widgets/textures/BtnNavigGold.uasset
# Content/Widgets/textures/BtnNavigGold_1.uasset
# Content/Widgets/textures/BtnRnd120Pharmancy.uasset
# Content/Widgets/textures/BtnRnd120PharmancyDisabled.uasset
# Content/Widgets/textures/BtnRnd120PharmancyPressed.uasset
# Content/Widgets/textures/BtnRnd120Pray.uasset
# Content/Widgets/textures/BtnRnd120PrayDisabled.uasset
# Content/Widgets/textures/BtnRnd120PrayPressed.uasset
# Content/Widgets/textures/BtnRnd120ReceptDisabled.uasset
# Content/Widgets/textures/BtnRnd120ReceptPressed.uasset
# Content/Widgets/textures/BtnRnd120Reception.uasset
# Content/Widgets/textures/BtnRnd120Tap.uasset
# Content/Widgets/textures/BtnRnd58Pressed.uasset
# Content/Widgets/textures/BtnRnd64Location.uasset
# Content/Widgets/textures/BtnRnd64LocationDisabled.uasset
# Content/Widgets/textures/BtnRnd64LocationPressed.uasset
# Content/Widgets/textures/BtnRnd70Search.uasset
# Content/Widgets/textures/BtnRnd70SearchPressed.uasset
# Content/Widgets/textures/BtnRnd76-1.uasset
# Content/Widgets/textures/BtnRnd76.uasset
# Content/Widgets/textures/BtnRnd76Camera.uasset
# Content/Widgets/textures/BtnRnd76CameraPressed.uasset
# Content/Widgets/textures/BtnRnd76CameraPressedY.uasset
# Content/Widgets/textures/BtnRnd76Facade.uasset
# Content/Widgets/textures/BtnRnd76FacadeDisabled.uasset
# Content/Widgets/textures/BtnRnd76FacadePressed.uasset
# Content/Widgets/textures/BtnRnd76Minus.uasset
# Content/Widgets/textures/BtnRnd76MinusDisabled.uasset
# Content/Widgets/textures/BtnRnd76Plus.uasset
# Content/Widgets/textures/BtnRnd76PlusDisabled.uasset
# Content/Widgets/textures/BtnRnd76Tap.uasset
# Content/Widgets/textures/BtnRnd76TapPressed.uasset
# Content/Widgets/textures/BtnServicesGold.uasset
# Content/Widgets/textures/BtnServicesGoldPressed.uasset
# Content/Widgets/textures/ButtonRnd120Cancel.uasset
# Content/Widgets/textures/ButtonRnd120CancelPressed.uasset
# Content/Widgets/textures/ButtonRnd120Demonstr.uasset
# Content/Widgets/textures/ButtonRnd120DemonstrPressed.uasset
# Content/Widgets/textures/ButtonRnd120Toilet.uasset
# Content/Widgets/textures/ButtonRnd120ToiletDisabled.uasset
# Content/Widgets/textures/ButtonRnd120ToiletPressed.uasset
# Content/Widgets/textures/FloorBarDisabled.uasset
# Content/Widgets/textures/Frame_2592.uasset
# Content/Widgets/textures/Frame_2605.uasset
# Content/Widgets/textures/G.uasset
# Content/Widgets/textures/InputNumper.uasset
# Content/Widgets/textures/InputNumperWrong.uasset
# Content/Widgets/textures/Line_37.uasset
# Content/Widgets/textures/Notification/BtBackDefault.uasset
# Content/Widgets/textures/Notification/BtBackPressed.uasset
# Content/Widgets/textures/Notification/BtShow.uasset
# Content/Widgets/textures/Notification/BtShowPressed.uasset
# Content/Widgets/textures/Notification/Substrate.uasset
# Content/Widgets/textures/PathBar/Arrow.uasset
# Content/Widgets/textures/PathBar/Elevator.uasset
# Content/Widgets/textures/PathBar/Navigation.uasset
# Content/Widgets/textures/PathBar/PathPannel1.uasset
# Content/Widgets/textures/PathBar/PathPannel2.uasset
# Content/Widgets/textures/PathBar/Walk.uasset
# Content/Widgets/textures/QR.uasset
# Content/Widgets/textures/SegmentedContol.uasset
# Content/Widgets/textures/Unavailable_Button.uasset
# Content/Widgets/textures/appointments/ArrowNotification.uasset
# Content/Widgets/textures/appointments/Bar.uasset
# Content/Widgets/textures/appointments/BtLogin512.uasset
# Content/Widgets/textures/appointments/BtLogin512NonActive.uasset
# Content/Widgets/textures/appointments/BtLogin512Pressed.uasset
# Content/Widgets/textures/appointments/Card.uasset
# Content/Widgets/textures/appointments/CardTomorrow.uasset
# Content/Widgets/textures/appointments/Exit2.uasset
# Content/Widgets/textures/appointments/Get.uasset
# Content/Widgets/textures/appointments/Information.uasset
# Content/Widgets/textures/appointments/InputId.uasset
# Content/Widgets/textures/appointments/Insert.uasset
# Content/Widgets/textures/appointments/Phone.uasset
# Content/Widgets/textures/appointments/Print.uasset
# Content/Widgets/textures/appointments/PrintTicket240.uasset
# Content/Widgets/textures/appointments/PrintTicket240Pressed.uasset
# Content/Widgets/textures/appointments/ScanQR240.uasset
# Content/Widgets/textures/appointments/ScanQR240Pressed.uasset
# Content/Widgets/textures/appointments/Scroll.uasset
# Content/Widgets/textures/appointments/ShowRoute240.uasset
# Content/Widgets/textures/appointments/ShowRoute240Pressed.uasset
# Content/Widgets/textures/appointments/SubstrateGold.uasset
# Content/Widgets/textures/appointments/SubstrateGold770.uasset
# Content/Widgets/textures/appointments/SubstrateGoldNoApp.uasset
# Content/Widgets/textures/appointments/T_Button_Today.uasset
# Content/Widgets/textures/appointments/T_Button_Tomorrow.uasset
# Content/Widgets/textures/info/T_Cup_building.uasset
# Content/Widgets/textures/info/T_Dining_room.uasset
# Content/Widgets/textures/info/T_Lift.uasset
# Content/Widgets/textures/info/T_Pray_room.uasset
# Content/Widgets/textures/info/T_Recepcion.uasset
# Content/Widgets/textures/interior.uasset
# Content/Widgets/textures/keyboard/BgKeyboard.uasset
# Content/Widgets/textures/keyboard/K.uasset
# Content/Widgets/textures/keyboard/KBackSpace.uasset
# Content/Widgets/textures/keyboard/KBackSpacePressed.uasset
# Content/Widgets/textures/keyboard/KCancel.uasset
# Content/Widgets/textures/keyboard/KCancelPressed.uasset
# Content/Widgets/textures/keyboard/KPressed.uasset
# Content/Widgets/textures/keyboard/KSearch.uasset
# Content/Widgets/textures/keyboard/KSearchPressed.uasset
# Content/Widgets/textures/keyboard/KShift.uasset
# Content/Widgets/textures/keyboard/KShiftPressed.uasset
# Content/Widgets/textures/keyboard/KSpace.uasset
# Content/Widgets/textures/keyboard/KSpacePressed.uasset
# Content/Widgets/textures/mainBG.uasset
# Content/Widgets/textures/search/3/Floor3AreaA.uasset
# Content/Widgets/textures/search/3/Floor3AreaBC.uasset
# Content/Widgets/textures/search/BtBuildings.uasset
# Content/Widgets/textures/search/BtBuildingsPressed.uasset
# Content/Widgets/textures/search/BtElevators.uasset
# Content/Widgets/textures/search/BtElevatorsPressed.uasset
# Content/Widgets/textures/search/BtReceptions.uasset
# Content/Widgets/textures/search/BtReceptionsPressed.uasset
# Content/Widgets/textures/search/BtSearchFloorDefault1.uasset
# Content/Widgets/textures/search/BtSearchFloorDefault2.uasset
# Content/Widgets/textures/search/BtSearchFloorDefault3.uasset
# Content/Widgets/textures/search/BtSearchFloorDefault4.uasset
# Content/Widgets/textures/search/BtSearchFloorDefault5.uasset
# Content/Widgets/textures/search/BtSearchFloorDefault6.uasset
# Content/Widgets/textures/search/BtSearchFloorDefault7.uasset
# Content/Widgets/textures/search/BtSearchFloorDefault8.uasset
# Content/Widgets/textures/search/BtSearchFloorDefaultA.uasset
# Content/Widgets/textures/search/BtSearchFloorDefaultB.uasset
# Content/Widgets/textures/search/BtSearchFloorDefaultC.uasset
# Content/Widgets/textures/search/BtSearchFloorDefaultD.uasset
# Content/Widgets/textures/search/BtSearchFloorDefaultE.uasset
# Content/Widgets/textures/search/BtSearchFloorDefaultG.uasset
# Content/Widgets/textures/search/BtSearchFloorPressed1.uasset
# Content/Widgets/textures/search/BtSearchFloorPressed2.uasset
# Content/Widgets/textures/search/BtSearchFloorPressed3.uasset
# Content/Widgets/textures/search/BtSearchFloorPressed4.uasset
# Content/Widgets/textures/search/BtSearchFloorPressed5.uasset
# Content/Widgets/textures/search/BtSearchFloorPressed6.uasset
# Content/Widgets/textures/search/BtSearchFloorPressed7.uasset
# Content/Widgets/textures/search/BtSearchFloorPressed8.uasset
# Content/Widgets/textures/search/BtSearchFloorPressedA.uasset
# Content/Widgets/textures/search/BtSearchFloorPressedB.uasset
# Content/Widgets/textures/search/BtSearchFloorPressedC.uasset
# Content/Widgets/textures/search/BtSearchFloorPressedD.uasset
# Content/Widgets/textures/search/BtSearchFloorPressedE.uasset
# Content/Widgets/textures/search/BtSearchFloorPressedG.uasset
# Content/Widgets/textures/search/BtSearchShowRoute.uasset
# Content/Widgets/textures/search/BtSearchShowRoutePressed.uasset
# Content/Widgets/textures/search/BtnCatering.uasset
# Content/Widgets/textures/search/BtnCateringPressed.uasset
# Content/Widgets/textures/search/BtnCommonArea.uasset
# Content/Widgets/textures/search/BtnCommonAreaPressed.uasset
# Content/Widgets/textures/search/BtnMedicalOffices.uasset
# Content/Widgets/textures/search/BtnMedicalOfficesPressed.uasset
# Content/Widgets/textures/search/BtnRnd76Back.uasset
# Content/Widgets/textures/search/BtnRnd76BackPressed.uasset
# Content/Widgets/textures/search/BtnStores.uasset
# Content/Widgets/textures/search/BtnStoresPressed.uasset
# Content/Widgets/textures/search/InputSearch.uasset
# Content/Widgets/textures/search/Patient_Rooms.uasset
# Content/Widgets/textures/search/Patient_Rooms_Active.uasset
# Content/Widgets/textures/search/Pharmacy__2_.uasset
# Content/Widgets/textures/search/Pharmacy__3_.uasset
# Content/Widgets/textures/search/Prayer_Room.uasset
# Content/Widgets/textures/search/Prayer_Room__2_.uasset
# Content/Widgets/textures/search/ScroollBarSearch.uasset
# Content/Widgets/textures/search/Staff_Rooms.uasset
# Content/Widgets/textures/search/Staff_Rooms__2_.uasset
# Content/Widgets/textures/search/Tech_Rooms.uasset
# Content/Widgets/textures/search/Tech_Rooms__2_.uasset
# Content/Widgets/textures/search/Toilets.uasset
# Content/Widgets/textures/search/Toilets__2_.uasset
# Content/Widgets/textures/search/Utility_Rooms.uasset
# Content/Widgets/textures/search/Utility_Rooms__2_.uasset
# Content/Widgets/textures/search/VIP_Rooms.uasset
# Content/Widgets/textures/search/VIP_Rooms__2_.uasset
# Content/Widgets/textures/search/departments.uasset
# Content/Widgets/textures/search/gf/FloorGAreaA.uasset
# Content/Widgets/textures/search/gf/FloorGAreaBCD.uasset
# Content/Widgets/textures/search/gf/ReceptionsFloorGAreaB.uasset
# Content/Widgets/textures/search/otherBuilding/HR.uasset
# Content/Widgets/textures/search/otherBuilding/IT.uasset
# Content/Widgets/textures/search/otherBuilding/OutsideTheHospital.uasset
# Content/Widgets/textures/search/otherBuilding/OutsideTheHospital_v2.uasset
# Content/Widgets/textures/search/reception/ReceptionsFloor3AreaA.uasset
# Content/Widgets/textures/search/reception/ReseptionsFloor3AreaB.uasset
# Content/Widgets/textures/search/reception/ReseptionsFloorAll.uasset
# Content/Widgets/textures/search/reception/ReseptionsFloorG.uasset
# Content/Widgets/textures/search/reception/ReseptionsFloorGAreaA.uasset
# Content/Widgets/textures/search/reception/ReseptionsNoResults.uasset
# Content/Widgets/textures/search/shop/FloorGAreaAShops.uasset
# Content/Widgets/textures/services/BtMainMenu.uasset
# Content/Widgets/textures/services/BtMainMenuPressed.uasset
# Content/Widgets/textures/services/Window.uasset
# Content/Widgets/textures/sos/BtBackDefault.uasset
# Content/Widgets/textures/sos/BtBackPressed.uasset
# Content/Widgets/textures/sos/BtOKDefault.uasset
# Content/Widgets/textures/sos/BtOKPressed.uasset
# Content/Widgets/textures/sos/BtYesDefault.uasset
# Content/Widgets/textures/sos/BtYesPressed.uasset
# Content/Widgets/textures/sos/BtnRnd120Sos.uasset
# Content/Widgets/textures/sos/BtnRnd120SosPressed.uasset
# Content/Widgets/textures/sos/Cross.uasset
# Content/Widgets/textures/sos/Medicine.uasset
# Content/Widgets/textures/sos/Substrate.uasset
# Content/Widgets/textures/test.uasset
# Content/blueprints/NavBlocker.uasset
# Content/blueprints/environment/pathfinder/Pathfinder.uasset
# Content/blueprints/player/MKCCPlayer.uasset
# Content/blueprints/playerController/MKCCPlayerController.uasset
2021-11-10 17:30:57 +05:00
..
2021-11-10 13:46:33 +05:00
2021-11-10 13:46:33 +05:00
2021-11-10 13:46:33 +05:00
2021-11-10 13:46:33 +05:00
2021-11-10 13:46:33 +05:00
2021-11-10 17:30:57 +05:00
2021-11-10 13:46:33 +05:00