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

Commit Graph

  • c7d4191214 Cleanup Part 5 AimingStuff Kukukakhew 2026-06-02 22:40:30 -04:00
  • 7e2ce95fa1 Cleanup Part 4 Kukukakhew 2026-06-02 22:22:18 -04:00
  • f19e42477b Cleanup Part 3 Kukukakhew 2026-06-02 21:42:21 -04:00
  • 32c119b73b Cleanup part 2 Kukukakhew 2026-06-02 21:32:57 -04:00
  • c14eb09ce7 Reorganizing part 1 Kukukakhew 2026-06-02 21:10:36 -04:00
  • da3abbfafb Delete Content/Characters/Mannequins/Anims/Unarmed/ABP_Unarmed.uasset #8 WeaponBase Keeper317 2026-05-24 01:44:15 +00:00
  • e06de3f37e Merge pull request 'MergedMenus' (#7) from MenusAndStuffpt2 into main main Kukukakhew 2026-05-24 01:37:44 +00:00
  • 9056e32b00 sortof working ADS but not really. #7 MenusAndStuffpt2 Kukukakhew 2026-05-23 21:16:56 -04:00
  • 7a2a24b654 Changed projectile to spawn closer and smaller/faster Cody Larkin 2026-05-23 20:46:28 -04:00
  • 2b4db1367d Moved User Settings function to game instance Kukukakhew 2026-05-22 16:42:08 -04:00
  • b1d862ded9 Can now map controller buttons Kukukakhew 2026-05-22 15:52:43 -04:00
  • 365442bbb7 Removed unused apply button Kukukakhew 2026-05-22 15:26:18 -04:00
  • 94816eb54b Removing obsolete Audio Slider BP Kukukakhew 2026-05-22 15:11:09 -04:00
  • 7d9c2dfce8 Moved Audio Sliders to Object Oriented setup Kukukakhew 2026-05-22 15:04:51 -04:00
  • 5dbee0a354 forgotten updates? Cody Larkin 2026-05-18 01:52:12 -04:00
  • bd5b2e9f3a Graphics Settings Rework Kukukakhew 2026-05-17 11:01:21 -04:00
  • c8ade04bc8 Updated Mouse sensitivity Slider Kukukakhew 2026-05-16 23:32:15 -04:00
  • 12add78480 Multiple Changes to input and settings Kukukakhew 2026-05-16 23:06:48 -04:00
  • 9bdb9bac9a Added Controller Sensitivity Kukukakhew 2026-05-15 23:19:51 -04:00
  • c959246bc7 MainMenu can be navigated by controller Kukukakhew 2026-02-07 00:33:08 -05:00
  • e1986ef42f Added input events, added controller support for start menu Kukukakhew 2026-02-02 21:48:32 -05:00
  • ee4371c320 Added Prone speed logic, still needs animation Kukukakhew 2026-01-20 22:29:22 -05:00
  • 6d97d86c1d Added Lean Toggle Functionality Kukukakhew 2026-01-20 21:51:58 -05:00
  • 9b0eef7e4f Sprint,Crouch,Prone,Lean toggle options in UI Settings Kukukakhew 2026-01-20 20:59:37 -05:00
  • 16e03e2360 weapon setup Cody Larkin 2026-01-20 00:12:14 -05:00
  • f40d53a6ba Initial speed replication bugfix Kukukakhew 2026-01-16 21:27:55 -05:00
  • 9d24abd287 Sprint/Crouch Network Replication Kukukakhew 2026-01-16 21:17:19 -05:00
  • f00d4d1baf Added Input Actions for keyboard Kukukakhew 2026-01-04 02:16:08 -05:00
  • 0ddc2363c0 Sprint Speed tuning Kukukakhew 2026-01-04 01:20:02 -05:00
  • 9e071fd29e Added Sprint IA and speed modifier Kukukakhew 2026-01-04 00:57:28 -05:00
  • 5bf29d6cdb Merge branch 'MenusAndStuffpt2' of https://git.keeper317.com/Keeper317/open-conflict into MenusAndStuffpt2 Kukukakhew 2026-01-03 22:58:03 -05:00
  • cc1c8fa880 Added Crouch input/speed/logic Kukukakhew 2026-01-03 22:53:17 -05:00
  • 7d48a2d40b Merge pull request 'Merge pull request 'Main Rebase' (#5) from main into MenusAndStuffpt2' (#6) from MenusAndStuffpt2 into main Keeper317 2026-01-03 06:26:39 +00:00
  • 0361eb2c00 Merge pull request 'Main Rebase' (#5) from main into MenusAndStuffpt2 #6 Keeper317 2026-01-03 06:25:23 +00:00
  • 47e434f596 Merge remote-tracking branch 'open-conflict/main' #5 Cody Larkin 2026-01-03 01:24:59 -05:00
  • 5f827eeadf Added Event for when character is damaged Cody Larkin 2026-01-03 00:50:34 -05:00
  • 970101a74c Fixed HUD Healthbar updates Cody Larkin 2026-01-03 00:23:57 -05:00
  • 3f02fd02e5 Added OnRep to health componenet Cody Larkin 2026-01-03 00:10:33 -05:00
  • 4662e6701a health var updates correctly on client when hit by projectile Cody Larkin 2026-01-01 19:35:48 -05:00
  • ecd15c271f Working on netowrked projectiles Cody Larkin 2025-12-08 21:35:24 -05:00
  • 494d76833f setup hits on character Cody Larkin 2025-12-06 17:19:02 -05:00
  • da46541a07 Added basics for projectile system Cody Larkin 2025-12-05 23:57:59 -05:00
  • 7e393cd7bb DERP! Kukukakhew 2026-01-03 01:19:00 -05:00
  • ef5830dea3 Merge pull request 'https://differentdirection.youtrack.cloud/issue/OC-3/Replication-Projectiles complete' (#3) from projectilebase into main Keeper317 2026-01-03 06:14:24 +00:00
  • c7e3a83497 Added Event for when character is damaged #3 projectilebase Cody Larkin 2026-01-03 00:50:34 -05:00
  • 646276ab2c Fixed HUD Healthbar updates Cody Larkin 2026-01-03 00:23:57 -05:00
  • 7b9a33abfe Added OnRep to health componenet Cody Larkin 2026-01-03 00:10:33 -05:00
  • 3bb02d3cf8 Some work on a weapon slot. Kukukakhew 2026-01-01 21:11:08 -05:00
  • 3b9a02b3b1 health var updates correctly on client when hit by projectile Cody Larkin 2026-01-01 19:35:48 -05:00
  • 398ea98e43 fixeded? Cody Larkin 2025-12-09 00:11:42 -05:00
  • 0c657b9228 testing stuff - ads Kukukakhew 2025-12-08 23:27:25 -05:00
  • dd3648f5b9 Working on netowrked projectiles Cody Larkin 2025-12-08 21:35:24 -05:00
  • 39e416295b Added weapon class and data asset, weapons can be spawned to actor Kukukakhew 2025-12-06 21:32:09 -05:00
  • a3a120491d setup hits on character Cody Larkin 2025-12-06 17:19:02 -05:00
  • eb402e0458 Added basics for projectile system Cody Larkin 2025-12-05 23:57:59 -05:00
  • 89de109296 fixed delayed healing adding additional timers on each damage event Cody Larkin 2025-12-05 01:31:57 -05:00
  • fcacd2020a Adding animations and updates to health component Kukukakhew 2025-12-05 00:00:56 -05:00
  • 863b73bbbf Added Class data table Kukukakhew 2025-12-01 21:08:15 -05:00
  • 750082411f Moved health calcs to functions Kukukakhew 2025-12-01 20:28:22 -05:00
  • 13fb876580 Working health bar Kukukakhew 2025-12-01 20:00:01 -05:00
  • 4ef273f6dc some hud progress. Healthbar events not working Kukukakhew 2025-12-01 19:09:27 -05:00
  • 20a1478bdc Added max health and current health to component characterSetup Cody Larkin 2025-11-29 16:38:42 -05:00
  • 332288258e Lean Part 1 Kukukakhew 2025-11-29 00:36:05 -05:00
  • 4b856b1d24 fixed camera attachment Cody Larkin 2025-11-28 22:27:57 -05:00
  • f46b65df11 Leaning stuff experiment Kukukakhew 2025-11-28 21:33:10 -05:00
  • 81381675e3 Corrected Sensitivity Slider values Kukukakhew 2025-11-26 22:01:19 -05:00
  • 59bc1a9b22 Added mouse sensitivity to C++ class Kukukakhew 2025-11-26 21:15:04 -05:00
  • faa7e1e436 Added Manny character Kukukakhew 2025-11-26 17:20:59 -05:00
  • cec59ce0e6 Bugfixes and optimizations Kukukakhew 2025-11-26 16:37:20 -05:00
  • 3948f56b86 Fixed startup resolution Kukukakhew 2025-11-26 11:20:09 -05:00
  • ae2c21f8e2 Pause menu added Kukukakhew 2025-11-23 23:35:50 -05:00
  • ec3c886a42 Bugfix, joining player can't move Kukukakhew 2025-11-23 21:38:15 -05:00
  • d2e1db997d made health componenet Cody Larkin 2025-11-23 20:11:46 -05:00
  • e252076191 Connect by IP is working Kukukakhew 2025-11-23 20:10:36 -05:00
  • 3f5fa83f48 Added Game Instance, some UI to Direct Connect (enter IP) in main menu Kukukakhew 2025-11-23 18:05:43 -05:00
  • 68cd610a57 Working join LAN Game Kukukakhew 2025-11-23 11:05:14 -05:00
  • 45c8db144b Renaming BP Kukukakhew 2025-11-22 23:32:01 -05:00
  • 3ab187545c Merge Fixes Kukukakhew 2025-11-22 23:29:56 -05:00
  • 442b977a65 Merge branch 'MenusAndStuff' Cody Larkin 2025-11-22 22:41:32 -05:00
  • 9f933f1f9c Cleaned out assets not used in main Kukukakhew 2025-11-22 22:34:09 -05:00
  • 8c1de34eb5 Merge pull request 'Solved movement and basic replication' (#1) from multiplayerv2 into main Keeper317 2025-11-23 03:22:14 +00:00
  • 63a8e63dfe Host Game now opens level Kukukakhew 2025-11-22 22:19:33 -05:00
  • c0152e2db4 Expanded playground play area #1 Cody Larkin 2025-11-22 22:18:41 -05:00
  • 44d54457ae fixed character movement issue Cody Larkin 2025-11-22 22:18:21 -05:00
  • 73a3aac159 renamed files to fit convention Cody Larkin 2025-11-22 19:07:48 -05:00
  • bb0d0a8660 problem solved, no idea why Cody Larkin 2025-11-22 16:28:39 -05:00
  • 1a9364c821 Test Character and controller Kukukakhew 2025-11-22 13:06:39 -05:00
  • a59399ebfe continued setup Cody Larkin 2025-11-22 00:34:20 -05:00
  • c91d73ed33 Base files added Cody Larkin 2025-11-21 23:38:16 -05:00
  • 0598ac722c Keybindings settings added Kukukakhew 2025-11-21 21:56:12 -05:00
  • 7976384ac1 Added Sensitivity Settings Kukukakhew 2025-11-21 20:20:22 -05:00
  • a4c547d7ce Reorganized code for audio Kukukakhew 2025-11-21 01:23:05 -05:00
  • 53aa864df2 Audio Settings Kukukakhew 2025-11-20 22:31:59 -05:00
  • 4f499aab8e Display settings pt2. Kukukakhew 2025-11-20 00:54:30 -05:00
  • 25cc608321 Display Settings Pt1 Kukukakhew 2025-11-19 23:52:44 -05:00
  • 206dc5d36e Graphics Menu Kukukakhew 2025-11-18 01:27:20 -05:00
  • 99c6f2fd3b Its a start Kukukakhew 2025-11-17 23:00:53 -05:00
  • ff9fcf7aa7 init project settings changed Cody Larkin 2025-11-17 21:06:50 -05:00
  • 22d55c406a updated gitignore to include Rider files Cody Larkin 2025-11-17 20:47:06 -05:00
  • 5e97933dff init Cody Larkin 2025-11-17 20:28:58 -05:00