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

Compare commits

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

9 Commits
b1d862ded9 ... AimingStuf

Author SHA1 Message Date
Kukukakhew
c7d4191214 Cleanup Part 5 2026-06-02 22:40:30 -04:00
Kukukakhew
7e2ce95fa1 Cleanup Part 4 2026-06-02 22:22:18 -04:00
Kukukakhew
f19e42477b Cleanup Part 3 2026-06-02 21:42:21 -04:00
Kukukakhew
32c119b73b Cleanup part 2 2026-06-02 21:32:57 -04:00
Kukukakhew
c14eb09ce7 Reorganizing part 1 2026-06-02 21:10:36 -04:00
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
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
515 changed files with 1 additions and 0 deletions
Expand all files Collapse all files

BIN
Content/AnimStarterPack/Aim_Space_Hip.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Aim_Space_Ironsights.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/BS_CrouchWalk.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/BS_Jog.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Crouch_Idle_Rifle_Hip.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Crouch_Idle_Rifle_Ironsights.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Crouch_Walk_Bwd_Rifle_Hip.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Crouch_Walk_Bwd_Rifle_Ironsights.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Crouch_Walk_Fwd_Rifle_Hip.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Crouch_Walk_Fwd_Rifle_Ironsights.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Crouch_Walk_Lt_Rifle_Hip.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Crouch_Walk_Lt_Rifle_Ironsights.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Crouch_Walk_Rt_Rifle_Hip.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Crouch_Walk_Rt_Rifle_Ironsights.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Crouch_to_Stand_Rifle_Hip.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Crouch_to_Stand_Rifle_Ironsights.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Death_1.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Death_2.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Death_3.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Death_Ironsights_1.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Death_Ironsights_2.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Equip_Pistol_Standing.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Equip_Rifle_Standing.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Fire_Rifle_Hip.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Fire_Rifle_Ironsights.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Fire_Shotgun_Hip.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Fire_Shotgun_Ironsights.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Hit_React_1.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Hit_React_2.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Hit_React_3.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Hit_React_4.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Idle_Pistol.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Idle_Rifle_Hip.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Idle_Rifle_Hip_Break1.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Idle_Rifle_Hip_Break2.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Idle_Rifle_Ironsights.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Jog_Bwd_Rifle.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Jog_Fwd_Rifle.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Jog_Lt_Rifle.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Jog_Rt_Rifle.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Jump_From_Jog.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Jump_From_Stand.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Jump_From_Stand_Ironsights.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Prone_Death_1.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Prone_Death_2.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Prone_Fire_1.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Prone_Fire_2.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Prone_Idle.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Prone_Reload_Rifle.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Prone_Reload_Shotgun.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Prone_To_Stand.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Reload_Pistol.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Reload_Rifle_Hip.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Reload_Rifle_Ironsights.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Reload_Shotgun_Hip.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Reload_Shotgun_Ironsights.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Showcase.umap
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Sprint_Fwd_Rifle.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Stand_To_Prone.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Stand_to_Crouch_Rifle_Hip.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/Stand_to_Crouch_Rifle_Ironsights.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE4ASP_HeroTPP_AnimBlueprint.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE4_Mannequin/Materials/M_UE4Man_Body.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE4_Mannequin/Materials/M_UE4Man_ChestLogo.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/ML_GlossyBlack_Latex_UE4.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/ML_Plastic_Shiny_Beige.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/ML_Plastic_Shiny_Beige_LOGO.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/ML_SoftMetal_UE4.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/T_ML_Aluminum01.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/T_ML_Aluminum01_N.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/T_ML_Rubber_Blue_01_D.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE4_Mannequin/Materials/MaterialLayers/T_ML_Rubber_Blue_01_N.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE4_Mannequin/Mesh/SK_Mannequin.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE4_Mannequin/Mesh/SK_Mannequin_PhysicsAsset.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE4_Mannequin/Mesh/UE4_Mannequin_Skeleton.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE4_Mannequin/Textures/UE4Man_Logo_N.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE4_Mannequin/Textures/UE4_LOGO_CARD.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE4_Mannequin/Textures/UE4_Mannequin_MAT_MASKA.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE4_Mannequin/Textures/UE4_Mannequin__normals.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE4_Mannequin/Textures/UE4_Mannequin_occlusion_Mobile.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE5/UE5_Aim_Space_Hip.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE5/UE5_Aim_Space_Ironsights.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE5/UE5_BS_CrouchWalk.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE5/UE5_BS_Jog.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE5/UE5_Crouch_Idle_Rifle_Ironsights.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE5/UE5_Crouch_Walk_Bwd_Rifle_Hip.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE5/UE5_Crouch_Walk_Bwd_Rifle_Ironsights.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE5/UE5_Crouch_Walk_Fwd_Rifle_Ironsights.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE5/UE5_Crouch_Walk_Lt_Rifle_Hip.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE5/UE5_Crouch_Walk_Lt_Rifle_Ironsights.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE5/UE5_Crouch_Walk_Rt_Rifle_Hip.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE5/UE5_Crouch_Walk_Rt_Rifle_Ironsights.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE5/UE5_Crouch_to_Stand_Rifle_Ironsights.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE5/UE5_Death_1.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE5/UE5_Death_2.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE5/UE5_Death_3.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE5/UE5_Death_Ironsights_1.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE5/UE5_Death_Ironsights_2.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE5/UE5_Equip_Pistol_Standing.uasset
View File

Binary file not shown.

BIN
Content/AnimStarterPack/UE5/UE5_Equip_Rifle_Standing.uasset
View File

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More