Keeper317/open-conflict
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Compare commits

base: Keeper317:0361eb2c0078c8a7c09a2cab88c18888b36f6302
Branches Tags
Keeper317:main Keeper317:AimingStuff Keeper317:WeaponBase Keeper317:MenusAndStuffpt2 Keeper317:projectilebase Keeper317:characterSetup
..
compare: Keeper317:main
Branches Tags
Keeper317:AimingStuff Keeper317:WeaponBase Keeper317:main Keeper317:MenusAndStuffpt2 Keeper317:projectilebase Keeper317:characterSetup

24 Commits
0361eb2c00 ... main

Author SHA1 Message Date
Kukukakhew
e06de3f37e Merge pull request 'MergedMenus' (#7) from MenusAndStuffpt2 into main 
Reviewed-on: #7
 2026-05-24 01:37:44 +00:00
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
7d48a2d40b 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 4 additions and 0 deletions
Expand all files Collapse all files

3
Config/DefaultEngine.ini
View File

@@ -113,3 +113,6 @@ ConnectionType=USBOnly
bUseManualIPAddress=False bUseManualIPAddress=False
ManualIPAddress= ManualIPAddress=
[/Script/Engine.AudioSettings]
DefaultBaseSoundMix=/Game/Sounds/MainSoundMix.MainSoundMix

BIN
Content/Characters/Mannequins/Anims/Unarmed/ABP_Unarmed.uasset
View File

Binary file not shown.

BIN
Content/Characters/Mannequins/Meshes/SKM_Manny_Simple.uasset
View File

Binary file not shown.

BIN
Content/Characters/Mannequins/Meshes/SK_Mannequin.uasset
View File

Binary file not shown.

BIN
Content/Characters/Mannequins/Rigs/CR_Mannequin_FootIK.uasset
View File

Binary file not shown.

BIN
Content/Input/Controller/C_Aim_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/Controller/C_Crouch_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/Controller/C_FireMode_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/Controller/C_Fire_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/Controller/C_Gadget_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/Controller/C_Grenade_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/Controller/C_Interact_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/Controller/C_Jump_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/Controller/C_LeanLeft_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/Controller/C_LeanRight_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/Controller/C_Look_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/Controller/C_Melee_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/Controller/C_Move_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/Controller/C_OpticMode_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/Controller/C_Pause_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/Controller/C_Ping_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/Controller/C_Prone_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/Controller/C_Reload_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/Controller/C_Sprint_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/Controller/C_SwapWeapon.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/Controller/C_SwitchToPrimaryWeapon_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/Controller/C_SwitchToSecondaryWeapon_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/Controller/C_SwitchToSpecialWeapon_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/Controller/C_Voip_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/Controller/Controller_IMC.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/Crouch_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/Default_IMC.uasset
View File

Binary file not shown.

BIN
Content/Input/FireMode_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/Fire_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/Gadget_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/Grenade_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/Interact_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/Melee_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/OpticMode_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/Ping_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/Prone_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/Reload_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/Sprint_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/SwapWeapon.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/SwitchToPrimaryWeapon_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/SwitchToSecondaryWeapon_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/SwitchToSpecialWeapon_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/Input/Voip_IA.uasset Normal file
View File

Binary file not shown.

BIN
Content/ProofOfConcept/CharacterMovementComponent_BP.uasset Normal file
View File

Binary file not shown.

BIN
Content/ProofOfConcept/DDICharacterInterface_BP.uasset Normal file
View File

Binary file not shown.

BIN
Content/ProofOfConcept/DDICharacter_BP.uasset
View File

Binary file not shown.

BIN
Content/ProofOfConcept/DDIGameInstanceInterface_BP.uasset
View File

Binary file not shown.

BIN
Content/ProofOfConcept/DDIGameInstance_BP.uasset
View File

Binary file not shown.

BIN
Content/ProofOfConcept/DDIPlayerController_BP.uasset
View File

Binary file not shown.

BIN
Content/ProofOfConcept/SettingsSave.uasset
View File

Binary file not shown.

BIN
Content/UI_Menus/Common/DDI_Button_BP.uasset
View File

Binary file not shown.

BIN
Content/UI_Menus/Common/DDI_CheckBox_BP1.uasset Normal file
View File

Binary file not shown.

BIN
Content/UI_Menus/Common/DDI_Selector.uasset Normal file
View File

Binary file not shown.

BIN
Content/UI_Menus/Common/DDI_Slider_BP.uasset Normal file
View File

Binary file not shown.

BIN
Content/UI_Menus/MainMenu/MainMenu_BP.uasset
View File

Binary file not shown.

BIN
Content/UI_Menus/MainMenu/MainMenu_Parts/BrowseServerList_BP.uasset
View File

Binary file not shown.

BIN
Content/UI_Menus/PauseMenu/PauseMenu_BP.uasset
View File

Binary file not shown.

BIN
Content/UI_Menus/SettingsMenu/Controls/BP_SensitivitySlider.uasset
View File

Binary file not shown.

BIN
Content/UI_Menus/SettingsMenu/Controls/KeyCategories.uasset
View File

Binary file not shown.

BIN
Content/UI_Menus/SettingsMenu/Controls/KeyMappings.uasset
View File

Binary file not shown.

BIN
Content/UI_Menus/SettingsMenu/Settings/ApplyGraphicsSettings_BP.uasset
View File

Binary file not shown.

BIN
Content/UI_Menus/SettingsMenu/Settings/AudioSettings_BP.uasset
View File

Binary file not shown.

BIN
Content/UI_Menus/SettingsMenu/Settings/GraphicsSettings_BP.uasset
View File

Binary file not shown.

BIN
Content/UI_Menus/SettingsMenu/SettingsMenu_BP.uasset
View File

Binary file not shown.

BIN
Content/UI_Menus/SettingsMenu/SettingsSave.uasset
View File

Binary file not shown.

BIN
Content/UI_Menus/StartMenu/StartMenu_BP.uasset
View File

Binary file not shown.

BIN
Content/Weapons/Pistol_03/DA_Weapon_Pistol_03.uasset Normal file
View File

Binary file not shown.

BIN
Content/Weapons/Pistol_03/Fbx_Default_Material_0.uasset Normal file
View File

Binary file not shown.

BIN
Content/Weapons/Pistol_03/Test2.uasset Normal file
View File

Binary file not shown.

BIN
Content/Weapons/Pistol_03/Test2_PhysicsAsset.uasset Normal file
View File

Binary file not shown.

BIN
Content/Weapons/Pistol_03/Test2_Skeleton.uasset Normal file
View File

Binary file not shown.

BIN
Content/Weapons/Pistol_03/Weapon_Pistol_03_BP.uasset Normal file
View File

Binary file not shown.

BIN
Content/Weapons/Pistol_Test/DA_Weapon_Pistol_02.uasset Normal file
View File

Binary file not shown.

BIN
Content/Weapons/Pistol_Test/Fbx_Default_Material_0.uasset Normal file
View File

Binary file not shown.

BIN
Content/Weapons/Pistol_Test/Weapon_BP_Pistol_02.uasset Normal file
View File

Binary file not shown.

BIN
Content/Weapons/Pistol_Test/test.uasset Normal file
View File

Binary file not shown.

BIN
Content/Weapons/Pistol_Test/test_PhysicsAsset.uasset Normal file
View File

Binary file not shown.

BIN
Content/Weapons/Pistol_Test/test_Skeleton.uasset Normal file
View File

Binary file not shown.

BIN
Content/Weapons/Weapon_BP.uasset
View File

Binary file not shown.

1
OpenConflict.sln.DotSettings.user
View File

@@ -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"> <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_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_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> <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>