Merge pull request 'Merge pull request 'Main Rebase' (#5 ) from main into MenusAndStuffpt2' (#6 ) from MenusAndStuffpt2 into main

Reviewed-on: http://git.keeper317.com/Keeper317/open-conflict/pulls/6
2026-01-03 06:26:39 +00:00
85 changed files with 0 additions and 4 deletions
--- a/Config/DefaultEngine.ini
+++ b/Config/DefaultEngine.ini
@@ -113,6 +113,3 @@ ConnectionType=USBOnly
 bUseManualIPAddress=False
 ManualIPAddress=
 [/Script/Engine.AudioSettings]
 DefaultBaseSoundMix=/Game/Sounds/MainSoundMix.MainSoundMix
--- a/Content/Characters/Mannequins/Anims/Unarmed/ABP_Unarmed.uasset
+++ b/Content/Characters/Mannequins/Anims/Unarmed/ABP_Unarmed.uasset
--- a/Content/Characters/Mannequins/Meshes/SKM_Manny_Simple.uasset
+++ b/Content/Characters/Mannequins/Meshes/SKM_Manny_Simple.uasset
--- a/Content/Characters/Mannequins/Meshes/SK_Mannequin.uasset
+++ b/Content/Characters/Mannequins/Meshes/SK_Mannequin.uasset
--- a/Content/Characters/Mannequins/Rigs/CR_Mannequin_FootIK.uasset
+++ b/Content/Characters/Mannequins/Rigs/CR_Mannequin_FootIK.uasset
--- a/Content/Input/Controller/C_Aim_IA.uasset
+++ b/Content/Input/Controller/C_Aim_IA.uasset
--- a/Content/Input/Controller/C_Crouch_IA.uasset
+++ b/Content/Input/Controller/C_Crouch_IA.uasset
--- a/Content/Input/Controller/C_FireMode_IA.uasset
+++ b/Content/Input/Controller/C_FireMode_IA.uasset
--- a/Content/Input/Controller/C_Fire_IA.uasset
+++ b/Content/Input/Controller/C_Fire_IA.uasset
--- a/Content/Input/Controller/C_Gadget_IA.uasset
+++ b/Content/Input/Controller/C_Gadget_IA.uasset
--- a/Content/Input/Controller/C_Grenade_IA.uasset
+++ b/Content/Input/Controller/C_Grenade_IA.uasset
--- a/Content/Input/Controller/C_Interact_IA.uasset
+++ b/Content/Input/Controller/C_Interact_IA.uasset
--- a/Content/Input/Controller/C_Jump_IA.uasset
+++ b/Content/Input/Controller/C_Jump_IA.uasset
--- a/Content/Input/Controller/C_LeanLeft_IA.uasset
+++ b/Content/Input/Controller/C_LeanLeft_IA.uasset
--- a/Content/Input/Controller/C_LeanRight_IA.uasset
+++ b/Content/Input/Controller/C_LeanRight_IA.uasset
--- a/Content/Input/Controller/C_Look_IA.uasset
+++ b/Content/Input/Controller/C_Look_IA.uasset
--- a/Content/Input/Controller/C_Melee_IA.uasset
+++ b/Content/Input/Controller/C_Melee_IA.uasset
--- a/Content/Input/Controller/C_Move_IA.uasset
+++ b/Content/Input/Controller/C_Move_IA.uasset
--- a/Content/Input/Controller/C_OpticMode_IA.uasset
+++ b/Content/Input/Controller/C_OpticMode_IA.uasset
--- a/Content/Input/Controller/C_Pause_IA.uasset
+++ b/Content/Input/Controller/C_Pause_IA.uasset
--- a/Content/Input/Controller/C_Ping_IA.uasset
+++ b/Content/Input/Controller/C_Ping_IA.uasset
--- a/Content/Input/Controller/C_Prone_IA.uasset
+++ b/Content/Input/Controller/C_Prone_IA.uasset
--- a/Content/Input/Controller/C_Reload_IA.uasset
+++ b/Content/Input/Controller/C_Reload_IA.uasset
--- a/Content/Input/Controller/C_Sprint_IA.uasset
+++ b/Content/Input/Controller/C_Sprint_IA.uasset
--- a/Content/Input/Controller/C_SwapWeapon.uasset
+++ b/Content/Input/Controller/C_SwapWeapon.uasset
--- a/Content/Input/Controller/C_SwitchToPrimaryWeapon_IA.uasset
+++ b/Content/Input/Controller/C_SwitchToPrimaryWeapon_IA.uasset
--- a/Content/Input/Controller/C_SwitchToSecondaryWeapon_IA.uasset
+++ b/Content/Input/Controller/C_SwitchToSecondaryWeapon_IA.uasset
--- a/Content/Input/Controller/C_SwitchToSpecialWeapon_IA.uasset
+++ b/Content/Input/Controller/C_SwitchToSpecialWeapon_IA.uasset
--- a/Content/Input/Controller/C_Voip_IA.uasset
+++ b/Content/Input/Controller/C_Voip_IA.uasset
--- a/Content/Input/Controller/Controller_IMC.uasset
+++ b/Content/Input/Controller/Controller_IMC.uasset
--- a/Content/Input/Crouch_IA.uasset
+++ b/Content/Input/Crouch_IA.uasset
--- a/Content/Input/Default_IMC.uasset
+++ b/Content/Input/Default_IMC.uasset
--- a/Content/Input/FireMode_IA.uasset
+++ b/Content/Input/FireMode_IA.uasset
--- a/Content/Input/Fire_IA.uasset
+++ b/Content/Input/Fire_IA.uasset
--- a/Content/Input/Gadget_IA.uasset
+++ b/Content/Input/Gadget_IA.uasset
--- a/Content/Input/Grenade_IA.uasset
+++ b/Content/Input/Grenade_IA.uasset
--- a/Content/Input/Interact_IA.uasset
+++ b/Content/Input/Interact_IA.uasset
--- a/Content/Input/Melee_IA.uasset
+++ b/Content/Input/Melee_IA.uasset
--- a/Content/Input/OpticMode_IA.uasset
+++ b/Content/Input/OpticMode_IA.uasset
--- a/Content/Input/Ping_IA.uasset
+++ b/Content/Input/Ping_IA.uasset
--- a/Content/Input/Prone_IA.uasset
+++ b/Content/Input/Prone_IA.uasset
--- a/Content/Input/Reload_IA.uasset
+++ b/Content/Input/Reload_IA.uasset
--- a/Content/Input/Sprint_IA.uasset
+++ b/Content/Input/Sprint_IA.uasset
--- a/Content/Input/SwapWeapon.uasset
+++ b/Content/Input/SwapWeapon.uasset
--- a/Content/Input/SwitchToPrimaryWeapon_IA.uasset
+++ b/Content/Input/SwitchToPrimaryWeapon_IA.uasset
--- a/Content/Input/SwitchToSecondaryWeapon_IA.uasset
+++ b/Content/Input/SwitchToSecondaryWeapon_IA.uasset
--- a/Content/Input/SwitchToSpecialWeapon_IA.uasset
+++ b/Content/Input/SwitchToSpecialWeapon_IA.uasset
--- a/Content/Input/Voip_IA.uasset
+++ b/Content/Input/Voip_IA.uasset
--- a/Content/ProofOfConcept/CharacterMovementComponent_BP.uasset
+++ b/Content/ProofOfConcept/CharacterMovementComponent_BP.uasset
--- a/Content/ProofOfConcept/DDICharacterInterface_BP.uasset
+++ b/Content/ProofOfConcept/DDICharacterInterface_BP.uasset
--- a/Content/ProofOfConcept/DDICharacter_BP.uasset
+++ b/Content/ProofOfConcept/DDICharacter_BP.uasset
--- a/Content/ProofOfConcept/DDIGameInstanceInterface_BP.uasset
+++ b/Content/ProofOfConcept/DDIGameInstanceInterface_BP.uasset
--- a/Content/ProofOfConcept/DDIGameInstance_BP.uasset
+++ b/Content/ProofOfConcept/DDIGameInstance_BP.uasset
--- a/Content/ProofOfConcept/DDIPlayerController_BP.uasset
+++ b/Content/ProofOfConcept/DDIPlayerController_BP.uasset
--- a/Content/ProofOfConcept/SettingsSave.uasset
+++ b/Content/ProofOfConcept/SettingsSave.uasset
--- a/Content/UI_Menus/Common/DDI_Button_BP.uasset
+++ b/Content/UI_Menus/Common/DDI_Button_BP.uasset
--- a/Content/UI_Menus/Common/DDI_CheckBox_BP1.uasset
+++ b/Content/UI_Menus/Common/DDI_CheckBox_BP1.uasset
--- a/Content/UI_Menus/Common/DDI_Selector.uasset
+++ b/Content/UI_Menus/Common/DDI_Selector.uasset
--- a/Content/UI_Menus/Common/DDI_Slider_BP.uasset
+++ b/Content/UI_Menus/Common/DDI_Slider_BP.uasset
--- a/Content/UI_Menus/MainMenu/MainMenu_BP.uasset
+++ b/Content/UI_Menus/MainMenu/MainMenu_BP.uasset
--- a/Content/UI_Menus/MainMenu/MainMenu_Parts/BrowseServerList_BP.uasset
+++ b/Content/UI_Menus/MainMenu/MainMenu_Parts/BrowseServerList_BP.uasset
--- a/Content/UI_Menus/PauseMenu/PauseMenu_BP.uasset
+++ b/Content/UI_Menus/PauseMenu/PauseMenu_BP.uasset
--- a/Content/UI_Menus/SettingsMenu/Controls/BP_SensitivitySlider.uasset
+++ b/Content/UI_Menus/SettingsMenu/Controls/BP_SensitivitySlider.uasset
--- a/Content/UI_Menus/SettingsMenu/Controls/KeyCategories.uasset
+++ b/Content/UI_Menus/SettingsMenu/Controls/KeyCategories.uasset
--- a/Content/UI_Menus/SettingsMenu/Controls/KeyMappings.uasset
+++ b/Content/UI_Menus/SettingsMenu/Controls/KeyMappings.uasset
--- a/Content/UI_Menus/SettingsMenu/Settings/ApplyGraphicsSettings_BP.uasset
+++ b/Content/UI_Menus/SettingsMenu/Settings/ApplyGraphicsSettings_BP.uasset
--- a/Content/UI_Menus/SettingsMenu/Settings/AudioSettings_BP.uasset
+++ b/Content/UI_Menus/SettingsMenu/Settings/AudioSettings_BP.uasset
--- a/Content/UI_Menus/SettingsMenu/Settings/GraphicsSettings_BP.uasset
+++ b/Content/UI_Menus/SettingsMenu/Settings/GraphicsSettings_BP.uasset
--- a/Content/UI_Menus/SettingsMenu/SettingsMenu_BP.uasset
+++ b/Content/UI_Menus/SettingsMenu/SettingsMenu_BP.uasset
--- a/Content/UI_Menus/SettingsMenu/SettingsSave.uasset
+++ b/Content/UI_Menus/SettingsMenu/SettingsSave.uasset
--- a/Content/UI_Menus/StartMenu/StartMenu_BP.uasset
+++ b/Content/UI_Menus/StartMenu/StartMenu_BP.uasset
--- a/Content/Weapons/Pistol_03/DA_Weapon_Pistol_03.uasset
+++ b/Content/Weapons/Pistol_03/DA_Weapon_Pistol_03.uasset
--- a/Content/Weapons/Pistol_03/Fbx_Default_Material_0.uasset
+++ b/Content/Weapons/Pistol_03/Fbx_Default_Material_0.uasset
--- a/Content/Weapons/Pistol_03/Test2.uasset
+++ b/Content/Weapons/Pistol_03/Test2.uasset
--- a/Content/Weapons/Pistol_03/Test2_PhysicsAsset.uasset
+++ b/Content/Weapons/Pistol_03/Test2_PhysicsAsset.uasset
--- a/Content/Weapons/Pistol_03/Test2_Skeleton.uasset
+++ b/Content/Weapons/Pistol_03/Test2_Skeleton.uasset
--- a/Content/Weapons/Pistol_03/Weapon_Pistol_03_BP.uasset
+++ b/Content/Weapons/Pistol_03/Weapon_Pistol_03_BP.uasset
--- a/Content/Weapons/Pistol_Test/DA_Weapon_Pistol_02.uasset
+++ b/Content/Weapons/Pistol_Test/DA_Weapon_Pistol_02.uasset
--- a/Content/Weapons/Pistol_Test/Fbx_Default_Material_0.uasset
+++ b/Content/Weapons/Pistol_Test/Fbx_Default_Material_0.uasset
--- a/Content/Weapons/Pistol_Test/Weapon_BP_Pistol_02.uasset
+++ b/Content/Weapons/Pistol_Test/Weapon_BP_Pistol_02.uasset
--- a/Content/Weapons/Pistol_Test/test.uasset
+++ b/Content/Weapons/Pistol_Test/test.uasset
--- a/Content/Weapons/Pistol_Test/test_PhysicsAsset.uasset
+++ b/Content/Weapons/Pistol_Test/test_PhysicsAsset.uasset
--- a/Content/Weapons/Pistol_Test/test_Skeleton.uasset
+++ b/Content/Weapons/Pistol_Test/test_Skeleton.uasset
--- a/Content/Weapons/Weapon_BP.uasset
+++ b/Content/Weapons/Weapon_BP.uasset
--- a/OpenConflict.sln.DotSettings.user
+++ b/OpenConflict.sln.DotSettings.user
@@ -1,5 +1,4 @@
 <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/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=83F7D316_002D1724_002D38F0_002D85D9_002D704D5DF137A0_002Fdl_003ASource_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003FProgram_0020Files_003FEpic_0020Games_003FUE_005F5_002E7_003FEngine_003FSource_002Fd_003ARuntime_002Fd_003AEngine_002Fd_003AClasses_002Fd_003AGameFramework_002Ff_003AActor_002Eh/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=83F7D316_002D1724_002D38F0_002D85D9_002D704D5DF137A0_002Fdl_003ASource_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003FProgram_0020Files_003FEpic_0020Games_003FUE_005F5_002E7_003FEngine_003FSource_002Fd_003ARuntime_002Fd_003AEngine_002Fd_003AClasses_002Fd_003AGameFramework_002Ff_003ACharacterMovementComponent_002Eh/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=83F7D316_002D1724_002D38F0_002D85D9_002D704D5DF137A0_002Fdl_003ASource_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003FProgram_0020Files_003FEpic_0020Games_003FUE_005F5_002E7_003FEngine_003FSource_002Fd_003ARuntime_002Fd_003AEngine_002Fd_003AClasses_002Fd_003APhysicsEngine_002Ff_003APhysicsSpringComponent_002Eh/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=83F7D316_002D1724_002D38F0_002D85D9_002D704D5DF137A0_002Fdl_003ASource_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003FProgram_0020Files_003FEpic_0020Games_003FUE_005F5_002E7_003FEngine_003FSource_002Fd_003ARuntime_002Fd_003AUMG_002Fd_003APublic_002Fd_003AComponents_002Ff_003AWidgetSwitcher_002Eh/@EntryIndexedValue">ForceIncluded</s:String></wpf:ResourceDictionary>