Merge pull request 'MergedMenus' (#7 ) from MenusAndStuffpt2 into main

Reviewed-on: #7
sortof working ADS but not really.
2026-05-24 01:37:44 +00:00 · 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-01-03 06:26:39 +00:00
21 changed files with 0 additions and 0 deletions
--- 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/Input/Controller/Controller_IMC.uasset
+++ b/Content/Input/Controller/Controller_IMC.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/UI_Menus/SettingsMenu/Settings/ApplyGraphicsSettings_BP.uasset
+++ b/Content/UI_Menus/SettingsMenu/Settings/ApplyGraphicsSettings_BP.uasset
--- a/Content/UI_Menus/SettingsMenu/SettingsMenu_BP.uasset
+++ b/Content/UI_Menus/SettingsMenu/SettingsMenu_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
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
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