sortof working ADS but not really.

Moved User Settings function to game instance
IMC contexts are mapped here.
2026-05-23 21:16:56 -04:00 · 2026-05-22 16:42:08 -04:00 · 2026-05-22 15:52:43 -04:00 · 2026-05-22 15:26:18 -04:00 · 2026-05-22 15:11:09 -04:00 · 2026-05-22 15:04:51 -04:00
85 changed files with 4 additions and 0 deletions
--- a/Config/DefaultEngine.ini
+++ b/Config/DefaultEngine.ini
@@ -113,3 +113,6 @@ 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,4 +1,5 @@
 <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>
Author	SHA1	Message	Date
Kukukakhew	9056e32b00	sortof working ADS but not really.	2026-05-23 21:16:56 -04:00
Kukukakhew	2b4db1367d	Moved User Settings function to game instance IMC contexts are mapped here.	2026-05-22 16:42:08 -04:00
Kukukakhew	b1d862ded9	Can now map controller buttons	2026-05-22 15:52:43 -04:00
Kukukakhew	365442bbb7	Removed unused apply button using common button.	2026-05-22 15:26:18 -04:00
Kukukakhew	94816eb54b	Removing obsolete Audio Slider BP	2026-05-22 15:11:09 -04:00
Kukukakhew	7d9c2dfce8	Moved Audio Sliders to Object Oriented setup Code to modify sound settings migrated to Game Instance BP and just using a common slider widget for display.	2026-05-22 15:04:51 -04:00
Kukukakhew	bd5b2e9f3a	Graphics Settings Rework Moved to object oriented approach. Selector is a common asset that is reusable. Future changes to the look of the widget can be easily redone as all function for settings is handled by the game instance. The widget only needs to update its display and pass 2 strings back.	2026-05-17 11:01:21 -04:00
Kukukakhew	c8ade04bc8	Updated Mouse sensitivity Slider Old blueprint was single purpose for just mouse sensitivity. This is now handled with the common slider. Code and setting changes have been migrated to the game instance.	2026-05-16 23:32:15 -04:00
Kukukakhew	12add78480	Multiple Changes to input and settings Controller Input actions created with Controller IMC Controller input events created. Added Look sensitivity for controller. Created reusable slider for controller sensitivity. Created new reusable checkbox. Implemented crouch toggle ect for controller and kept separate from mouse/keyboard settings.	2026-05-16 23:06:48 -04:00
Kukukakhew	9bdb9bac9a	Added Controller Sensitivity	2026-05-15 23:19:51 -04:00
Kukukakhew	c959246bc7	MainMenu can be navigated by controller	2026-02-07 00:33:08 -05:00
Kukukakhew	e1986ef42f	Added input events, added controller support for start menu	2026-02-02 21:48:32 -05:00
Kukukakhew	ee4371c320	Added Prone speed logic, still needs animation	2026-01-20 22:29:22 -05:00
Kukukakhew	6d97d86c1d	Added Lean Toggle Functionality	2026-01-20 21:51:58 -05:00
Kukukakhew	9b0eef7e4f	Sprint,Crouch,Prone,Lean toggle options in UI Settings	2026-01-20 20:59:37 -05:00
Kukukakhew	f40d53a6ba	Initial speed replication bugfix	2026-01-16 21:27:55 -05:00
Kukukakhew	9d24abd287	Sprint/Crouch Network Replication	2026-01-16 21:17:19 -05:00
Kukukakhew	f00d4d1baf	Added Input Actions for keyboard No functionality, just the events and actions.	2026-01-04 02:16:08 -05:00
Kukukakhew	0ddc2363c0	Sprint Speed tuning Plus some bug fixes that caused super speed.	2026-01-04 01:20:02 -05:00
Kukukakhew	9e071fd29e	Added Sprint IA and speed modifier	2026-01-04 00:57:28 -05:00
Kukukakhew	5bf29d6cdb	Merge branch 'MenusAndStuffpt2' of https://git.keeper317.com/Keeper317/open-conflict into MenusAndStuffpt2	2026-01-03 22:58:03 -05:00
Kukukakhew	cc1c8fa880	Added Crouch input/speed/logic	2026-01-03 22:53:17 -05:00
Keeper317	0361eb2c00	Merge pull request 'Main Rebase' (#5 ) from main into MenusAndStuffpt2 Reviewed-on: http://git.keeper317.com/Keeper317/open-conflict/pulls/5	2026-01-03 06:25:23 +00:00