Merge branch 'dev' into Sound-and-music

# Conflicts:
#	EndlessVendetta/Content/Levels/ControlTutorialLevel.umap
#	EndlessVendetta/Content/Ships/BP_SpaceShip.uasset
#	EndlessVendetta/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset

EndlessVendetta/.gitignore

@@ -16,6 +16,7 @@
 ### UnrealEngine ###
 # Visual Studio 2015 user specific files
 .vs/
+.idea/
 
 # Compiled Object files
 *.slo

EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml

@@ -7,13 +7,15 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="8acc2658-cb31-4c49-857f-282cfee74640" name="Changes" comment="">
+    <list default="true" id="dfa3053d-1d51-4dad-9270-4c17e086f627" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/.idea.EndlessVendetta/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.EndlessVendetta/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/.idea.EndlessVendetta/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.EndlessVendetta/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/AssetPacks/CityEnvironmentMegapackVol2/Megapack/Textures/Favela/T_MeterGrid_01.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/AssetPacks/CityEnvironmentMegapackVol2/Megapack/Textures/Favela/T_MeterGrid_01.uasset" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Content/Levels/ControlTutorialLevel.umap" beforeDir="false" afterPath="$PROJECT_DIR$/Content/Levels/ControlTutorialLevel.umap" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/FirstPerson/Blueprints/BaseWeapons/BP_BaseWeapon.uasset" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Content/__ExternalActors__/Levels/DoorTestLevel/9/PG/AISD2CY0WTWKV1BJDYTYJ3.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/__ExternalActors__/Levels/DoorTestLevel/9/PG/AISD2CY0WTWKV1BJDYTYJ3.uasset" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Content/StarterContent/Particles/P_Ambient_Dust.uasset" beforeDir="false" afterPath="$PROJECT_DIR$/Content/StarterContent/Particles/P_Ambient_Dust.uasset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/Workbench&amp;Attachments/SilencerAttachmentClass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/Workbench&amp;Attachments/SilencerAttachmentClass.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Source/EndlessVendetta/Workbench&amp;Attachments/SilencerAttachmentClass.h" beforeDir="false" afterPath="$PROJECT_DIR$/Source/EndlessVendetta/Workbench&amp;Attachments/SilencerAttachmentClass.h" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -26,11 +28,11 @@
   <component name="MarkdownSettingsMigration">
     <option name="stateVersion" value="1" />
   </component>
-  <component name="ProjectColorInfo"><![CDATA[{
+  <component name="ProjectColorInfo">{
-  "customColor": "",
+  &quot;customColor&quot;: &quot;&quot;,
-  "associatedIndex": 5
+  &quot;associatedIndex&quot;: 7
-}]]></component>
+}</component>
-  <component name="ProjectId" id="2bBQ5ZFjKADdlvCf2VePqJdIy1m" />
+  <component name="ProjectId" id="2bp7o8dmlHZgRsYmVepgy7lbmpM" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
@@ -40,7 +42,7 @@
     "C++ Project.EndlessVendetta.executor": "Run",
     "RunOnceActivity.OpenProjectViewOnStart": "true",
     "RunOnceActivity.ShowReadmeOnStart": "true",
-    "git-widget-placeholder": "dev",
+    "git-widget-placeholder": "silencer-attachment-code",
     "ignore.virus.scanning.warn.message": "true",
     "node.js.detected.package.eslint": "true",
     "node.js.detected.package.tslint": "true",
@@ -51,9 +53,9 @@
   },
   "keyToStringList": {
     "rider.external.source.directories": [
-      "C:\\Users\\Rafal\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\DecompilerCache",
+      "C:\\Users\\mhara\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\DecompilerCache",
-      "C:\\Users\\Rafal\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\SourcesCache",
+      "C:\\Users\\mhara\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\SourcesCache",
-      "C:\\Users\\Rafal\\AppData\\Local\\Symbols\\src"
+      "C:\\Users\\mhara\\AppData\\Local\\Symbols\\src"
     ]
   }
 }]]></component>
@@ -123,12 +125,17 @@
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="8acc2658-cb31-4c49-857f-282cfee74640" name="Changes" comment="" />
+      <changelist id="dfa3053d-1d51-4dad-9270-4c17e086f627" name="Changes" comment="" />
-      <created>1705685810960</created>
+      <created>1706900339638</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
-      <updated>1705685810960</updated>
+      <updated>1706900339638</updated>
-      <workItem from="1705685813496" duration="640000" />
+      <workItem from="1706900342753" duration="2652000" />
+      <workItem from="1706972179014" duration="11096000" />
+      <workItem from="1707046474738" duration="8878000" />
+      <workItem from="1707103463352" duration="6662000" />
+      <workItem from="1707755232377" duration="4748000" />
+      <workItem from="1708344270014" duration="2574000" />
     </task>
     <servers />
   </component>

EndlessVendetta/Config/DefaultEngine.ini

@@ -60,7 +60,7 @@
 +CollisionChannelRedirects=(OldName="PawnMovement",NewName="Pawn")
 
 [/Script/EngineSettings.GameMapsSettings]
-EditorStartupMap=/Game/Levels/ControlTutorialLevel.ControlTutorialLevel
+EditorStartupMap=/Game/Levels/MainMenuLevel.MainMenuLevel
 LocalMapOptions=
 TransitionMap=None
 bUseSplitscreen=True
@@ -69,7 +69,7 @@ ThreePlayerSplitscreenLayout=FavorTop
 FourPlayerSplitscreenLayout=Grid
 bOffsetPlayerGamepadIds=False
 GameInstanceClass=/Script/EndlessVendetta.EVGameInstance
-GameDefaultMap=/Game/Levels/ControlTutorialLevel.ControlTutorialLevel
+GameDefaultMap=/Game/Levels/MainMenuLevel.MainMenuLevel
 ServerDefaultMap=/Engine/Maps/Entry.Entry
 GlobalDefaultGameMode=/Script/EndlessVendetta.EndlessVendettaGameMode
 GlobalDefaultServerGameMode=None

EndlessVendetta/Config/DefaultGame.ini

@@ -101,6 +101,9 @@ bSkipMovies=False
 +IniSectionDenylist=StorageServers
 +MapsToCook=(FilePath="/Game/Levels/ControlTutorialLevel")
 +MapsToCook=(FilePath="/Game/Levels/Apartment_hit")
++MapsToCook=(FilePath="/Game/Levels/MainMenuLevel")
++MapsToCook=(FilePath="/Game/Levels/TempOpenWorld")
++MapsToCook=(FilePath="/Game/Levels/EnemyAITest")
 +DirectoriesToAlwaysCook=(Path="/Interchange/Functions")
 +DirectoriesToAlwaysCook=(Path="/Interchange/gltf")
 +DirectoriesToAlwaysCook=(Path="/Interchange/Materials")