From 71c79f00bd535e144d130f5f43910ab68422a026 Mon Sep 17 00:00:00 2001 From: Rafal Swierczek Date: Fri, 2 Feb 2024 17:34:50 +0000 Subject: [PATCH] BugFix Merge Errors With Apartment Level --- .../.idea.EndlessVendetta/.idea/workspace.xml | 107 ++++++++++-------- EndlessVendetta/Config/DefaultGame.ini | 2 + .../Mirror_Texture/Bathroom_Mirror.uasset | 4 +- .../Shower_Texture/Shower_Texture.uasset | 4 +- .../Bathroom/Sink_Texture/Sink_Texture.uasset | 4 +- .../Bathroom/Tap_Texture/Tap_Texture.uasset | 4 +- .../Seat/Toilet_Seat_Texture.uasset | 4 +- .../Toilet/Toilet_Texture.uasset | 4 +- .../Kitchen/Materials/Counter.uasset | 4 +- .../Kitchen/Materials/Cupboard44.uasset | 4 +- .../Kitchen/Materials/Draws.uasset | 4 +- .../ceiling_light_02_orange.uasset | 4 +- .../lamp_01/lamp_01_blue.uasset | 4 +- .../wall_light_01/wall_light_01_orange.uasset | 4 +- .../wall_light_02/wall_light_02_orange.uasset | 4 +- .../Textures/BookShelf/B_BookShelf.uasset | 4 +- .../Textures/BookShelf/M_Books.uasset | 4 +- .../BookShelf_Edge/M_BooksShelfEdge.uasset | 4 +- .../Textures/CLOCK01/m_clock01.uasset | 4 +- .../Tutorial-Level/Textures/M_Chamber.uasset | 4 +- .../Textures/M_Gameboy_MugCup01.uasset | 4 +- .../Tutorial-Level/Textures/M_Table02.uasset | 4 +- .../Textures/M_WallPiece.uasset | 4 +- .../Textures/TRadio/M_Radio.uasset | 4 +- .../Textures/cabinets/cabinet_01.uasset | 4 +- .../Textures/chair_01/chair.uasset | 4 +- .../cofffee_table/coffee_table_bl.uasset | 4 +- .../Textures/fireplace/fireplace.uasset | 4 +- .../Textures/side_table/side_table_ye.uasset | 4 +- .../Textures/sofa_02/sofa_02.uasset | 4 +- .../Content/Levels/Apartment_hit.umap | 4 +- .../Content/Levels/MainMenuLevel.umap | 4 +- .../Gameplay/MainMenuPlayerController.uasset | 4 +- .../HDRI/HDRI_Epic_Courtyard_Daylight.uasset | 4 +- .../Materials/M_Dust_Particle.uasset | 4 +- .../Source/EndlessVendetta/EVGameInstance.cpp | 5 + .../Source/EndlessVendetta/EVGameInstance.h | 3 + .../EndlessVendetta/EndlessVendetta.Build.cs | 2 +- 38 files changed, 139 insertions(+), 112 deletions(-) diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml index ad59c6ef..a9337554 100644 --- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml +++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml @@ -3,17 +3,44 @@ Intermediate/ProjectFiles/EndlessVendetta.vcxproj - - - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +