Keeper317/open-conflict
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
68 Commits 6 Branches 0 Tags
16e03e23609ef43c39f4f03a92a607bfb9697a33
Commit Graph

68 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cody Larkin
16e03e2360 weapon setup 2026-01-20 00:12:14 -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
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
Cody Larkin
47e434f596 Merge remote-tracking branch 'open-conflict/main' 2026-01-03 01:24:59 -05:00
Cody Larkin
5f827eeadf Added Event for when character is damaged 2026-01-03 01:24:48 -05:00
Cody Larkin
970101a74c Fixed HUD Healthbar updates 2026-01-03 01:24:48 -05:00
Cody Larkin
3f02fd02e5 Added OnRep to health componenet 2026-01-03 01:24:48 -05:00
Cody Larkin
4662e6701a health var updates correctly on client when hit by projectile 2026-01-03 01:24:48 -05:00
Cody Larkin
ecd15c271f Working on netowrked projectiles 2026-01-03 01:24:47 -05:00
Cody Larkin
494d76833f setup hits on character 2026-01-03 01:24:07 -05:00
Cody Larkin
da46541a07 Added basics for projectile system 
still needs hits on character
 2026-01-03 01:24:07 -05:00
Kukukakhew
7e393cd7bb DERP! 2026-01-03 01:19:00 -05:00
Keeper317
ef5830dea3 Merge pull request 'https://differentdirection.youtrack.cloud/issue/OC-3/Replication-Projectiles complete' (#3) from projectilebase into main 
Reviewed-on: http://git.keeper317.com/Keeper317/open-conflict/pulls/3
 2026-01-03 06:14:24 +00:00
Cody Larkin
c7e3a83497 Added Event for when character is damaged 2026-01-03 00:50:34 -05:00
Cody Larkin
646276ab2c Fixed HUD Healthbar updates 2026-01-03 00:23:57 -05:00
Cody Larkin
7b9a33abfe Added OnRep to health componenet 2026-01-03 00:10:33 -05:00
Kukukakhew
3bb02d3cf8 Some work on a weapon slot. 2026-01-01 21:11:08 -05:00
Cody Larkin
3b9a02b3b1 health var updates correctly on client when hit by projectile 2026-01-01 19:35:48 -05:00
Cody Larkin
398ea98e43 fixeded? 2025-12-09 00:11:42 -05:00
Kukukakhew
0c657b9228 testing stuff - ads 2025-12-08 23:27:25 -05:00
Cody Larkin
dd3648f5b9 Working on netowrked projectiles 2025-12-08 21:35:24 -05:00
Kukukakhew
39e416295b Added weapon class and data asset, weapons can be spawned to actor 2025-12-06 21:32:09 -05:00
Cody Larkin
a3a120491d setup hits on character 2025-12-06 17:19:02 -05:00
Cody Larkin
eb402e0458 Added basics for projectile system 
still needs hits on character
 2025-12-05 23:57:59 -05:00
Cody Larkin
89de109296 fixed delayed healing adding additional timers on each damage event 2025-12-05 01:31:57 -05:00
Kukukakhew
fcacd2020a Adding animations and updates to health component 2025-12-05 00:00:56 -05:00
Kukukakhew
863b73bbbf Added Class data table 
Can select class from hud debug button
 2025-12-01 21:08:15 -05:00
Kukukakhew
750082411f Moved health calcs to functions 2025-12-01 20:28:22 -05:00
Kukukakhew
13fb876580 Working health bar 
Working with button on UI for now. Needs added to character health logic and events.
 2025-12-01 20:00:01 -05:00
Kukukakhew
4ef273f6dc some hud progress. Healthbar events not working 2025-12-01 19:09:27 -05:00
Kukukakhew
332288258e Lean Part 1 
Does not rotate camera yet
 2025-11-29 00:36:05 -05:00
Cody Larkin
4b856b1d24 fixed camera attachment 2025-11-28 22:27:57 -05:00
Kukukakhew
f46b65df11 Leaning stuff experiment 
remember to lean backwards and run jump
 2025-11-28 21:33:10 -05:00
Kukukakhew
81381675e3 Corrected Sensitivity Slider values 2025-11-26 22:01:19 -05:00
Kukukakhew
59bc1a9b22 Added mouse sensitivity to C++ class 
Added game instance C++ class (unused)
 2025-11-26 21:15:04 -05:00
Kukukakhew
faa7e1e436 Added Manny character 2025-11-26 17:20:59 -05:00
Kukukakhew
cec59ce0e6 Bugfixes and optimizations 
-More settings code moved to game instance
-Most buttons are now a new class widget that can be changed in one spot and update everywhere.
-game crash when hosting a game a second time fixed
 2025-11-26 16:37:20 -05:00
Kukukakhew
3948f56b86 Fixed startup resolution 
Startup resolution now remembers what you previously set it to.
Removed a bunch of casts in favor of interfaces.
 2025-11-26 11:20:09 -05:00
Kukukakhew
ae2c21f8e2 Pause menu added 2025-11-23 23:35:50 -05:00
Kukukakhew
ec3c886a42 Bugfix, joining player can't move 2025-11-23 21:38:15 -05:00
Kukukakhew
e252076191 Connect by IP is working 
127.0.0.1:7777
 2025-11-23 20:10:36 -05:00
Kukukakhew
3f5fa83f48 Added Game Instance, some UI to Direct Connect (enter IP) in main menu 
UI menu logic moved to Game Instance BP. Game instance persists when levels are closed and different gamemodes, characters ect are used.

Added Direct Connect window.
Does not actually connect just yet, just saves servers to list and lets you delete from the list.

Renamed some Blueprints
 2025-11-23 18:05:43 -05:00
Kukukakhew
68cd610a57 Working join LAN Game 
Needs reorganized. Join script is in another blueprint
 2025-11-23 11:05:14 -05:00
Kukukakhew
45c8db144b Renaming BP 2025-11-22 23:32:01 -05:00
Kukukakhew
3ab187545c Merge Fixes 
Player mappable Keys
Playground 1 default gamemode blueprint
 2025-11-22 23:29:56 -05:00
Cody Larkin
442b977a65 Merge branch 'MenusAndStuff' 2025-11-22 22:41:32 -05:00
Kukukakhew
9f933f1f9c Cleaned out assets not used in main 2025-11-22 22:34:09 -05:00
Keeper317
8c1de34eb5 Merge pull request 'Solved movement and basic replication' (#1) from multiplayerv2 into main 
Reviewed-on: http://git.keeper317.com/Keeper317/open-conflict/pulls/1
 2025-11-23 03:22:14 +00:00
Kukukakhew
63a8e63dfe Host Game now opens level 
There are some things in here meshes/characters/gamemodes that can be removed.
 2025-11-22 22:19:33 -05:00
Cody Larkin
c0152e2db4 Expanded playground play area 2025-11-22 22:18:41 -05:00