Rafal/EndlessVendetta
Rafal/EndlessVendetta
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

Fixed Merge Errors

Browse Source
This commit is contained in:
MH261677 2024-04-24 16:42:35 +01:00
parent e00ae75cc4
commit 46de66e5ed
7 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/AI_Speach_Congrats.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Contract/ContractImage.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Elevator/AI_Speach_Elevator.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/BountySystem/Tutorial/BountySpecificActors/Mayor/MayorImage.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/BountySystem/Tutorial/CinematicSequences/GadgetTraining/AI_Speach_GadgetTraining.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/MainMenu/Gameplay/MainMenuPlayerController.uasset (Stored with Git LFS)
View File

Binary file not shown.

2
EndlessVendetta/EndlessVendetta.sln.DotSettings.user
View File

@ -1,2 +0,0 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/Environment/Highlighting/HighlightingSourceSnapshotLocation/@EntryValue">C:\Users\Rafal\AppData\Local\JetBrains\Rider2023.3\resharper-host\temp\Rider\vAny\CoverageData\_EndlessVendetta.-1253833435\Snapshot\snapshot.utdcvr</s:String></wpf:ResourceDictionary>