91 Commits

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
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
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
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
47e434f596 Merge remote-tracking branch 'open-conflict/main' 2026-01-03 01:24:59 -05:00
5f827eeadf Added Event for when character is damaged 2026-01-03 01:24:48 -05:00
970101a74c Fixed HUD Healthbar updates 2026-01-03 01:24:48 -05:00
3f02fd02e5 Added OnRep to health componenet 2026-01-03 01:24:48 -05:00
4662e6701a health var updates correctly on client when hit by projectile 2026-01-03 01:24:48 -05:00
ecd15c271f Working on netowrked projectiles 2026-01-03 01:24:47 -05:00
494d76833f setup hits on character 2026-01-03 01:24:07 -05:00
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
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
c7e3a83497 Added Event for when character is damaged 2026-01-03 00:50:34 -05:00
646276ab2c Fixed HUD Healthbar updates 2026-01-03 00:23:57 -05:00
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
3b9a02b3b1 health var updates correctly on client when hit by projectile 2026-01-01 19:35:48 -05:00
398ea98e43 fixeded? 2025-12-09 00:11:42 -05:00
Kukukakhew
0c657b9228 testing stuff - ads 2025-12-08 23:27:25 -05:00
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
a3a120491d setup hits on character 2025-12-06 17:19:02 -05:00
eb402e0458 Added basics for projectile system
still needs hits on character
2025-12-05 23:57:59 -05:00
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
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
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
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
c0152e2db4 Expanded playground play area 2025-11-22 22:18:41 -05:00
44d54457ae fixed character movement issue 2025-11-22 22:18:21 -05:00
73a3aac159 renamed files to fit convention 2025-11-22 19:07:48 -05:00
bb0d0a8660 problem solved, no idea why 2025-11-22 16:28:39 -05:00
Kukukakhew
1a9364c821 Test Character and controller 2025-11-22 13:06:39 -05:00
a59399ebfe continued setup 2025-11-22 00:34:20 -05:00
c91d73ed33 Base files added
May have an idea of what caused problem
2025-11-21 23:38:16 -05:00
Kukukakhew
0598ac722c Keybindings settings added 2025-11-21 21:56:12 -05:00
Kukukakhew
7976384ac1 Added Sensitivity Settings 2025-11-21 20:20:22 -05:00
Kukukakhew
a4c547d7ce Reorganized code for audio 2025-11-21 01:23:05 -05:00
Kukukakhew
53aa864df2 Audio Settings
rough draft, works but needs cleaned up
2025-11-20 22:31:59 -05:00
Kukukakhew
4f499aab8e Display settings pt2.
Resolution and window mode.
No settings save file
2025-11-20 00:54:30 -05:00
Kukukakhew
25cc608321 Display Settings Pt1
Added Vsync and Framerate
2025-11-19 23:52:44 -05:00
Kukukakhew
206dc5d36e Graphics Menu
Auto populates scroll box.
Does not save settings or change.
2025-11-18 01:27:20 -05:00
Kukukakhew
99c6f2fd3b Its a start
Start Menu
Main Menu
Sound Classes
2025-11-17 23:00:53 -05:00
174 changed files with 843 additions and 3 deletions

File diff suppressed because one or more lines are too long

View File

@@ -1,8 +1,20 @@
[/Script/EngineSettings.GameMapsSettings]
GameDefaultMap=/Game/Worlds/Playground1.Playground1
EditorStartupMap=/Game/Worlds/Playground1.Playground1
EditorStartupMap=/Game/Worlds/MainMenu.MainMenu
LocalMapOptions=
TransitionMap=None
bUseSplitscreen=True
TwoPlayerSplitscreenLayout=Horizontal
ThreePlayerSplitscreenLayout=FavorTop
FourPlayerSplitscreenLayout=Grid
bShowAllPlayerWidgetsWhenSplitscreenDisabled=False
bOffsetPlayerGamepadIds=False
GameInstanceClass=/Game/ProofOfConcept/DDIGameInstance_BP.DDIGameInstance_BP_C
GameDefaultMap=/Game/Worlds/MainMenu.MainMenu
ServerDefaultMap=/Engine/Maps/Entry.Entry
GlobalDefaultGameMode=/Script/Engine.GameModeBase
GlobalDefaultServerGameMode=None
[/Script/Engine.RendererSettings]
r.AllowStaticLighting=False
@@ -101,3 +113,6 @@ ConnectionType=USBOnly
bUseManualIPAddress=False
ManualIPAddress=
[/Script/Engine.AudioSettings]
DefaultBaseSoundMix=/Game/Sounds/MainSoundMix.MainSoundMix

View File

@@ -0,0 +1,4 @@
[/Script/Engine.GameUserSettings]
ResolutionSizeX=1280
ResolutionSizeY=720
FullscreenMode=2

View File

@@ -0,0 +1,27 @@
;METADATA=(Diff=true, UseCommands=true)
[/Script/GameplayTags.GameplayTagsSettings]
ImportTagsFromConfig=True
WarnOnInvalidTags=True
ClearInvalidTags=False
AllowEditorTagUnloading=True
AllowGameTagUnloading=False
FastReplication=False
bDynamicReplication=False
InvalidTagCharacters="\"\',"
NumBitsForContainerSize=6
NetIndexFirstBitSegment=16
+GameplayTagRedirects=(OldTagName="Weapon.Slot1",NewTagName="Weapon.PrimarySlot")
+GameplayTagList=(Tag="Aim",DevComment="")
+GameplayTagList=(Tag="Aim.CanAim",DevComment="")
+GameplayTagList=(Tag="Aim.IronSights",DevComment="")
+GameplayTagList=(Tag="Aim.IsADS",DevComment="")
+GameplayTagList=(Tag="Aim.Scope",DevComment="")
+GameplayTagList=(Tag="Aim.Sight",DevComment="")
+GameplayTagList=(Tag="Weapon",DevComment="")
+GameplayTagList=(Tag="Weapon.CanFire",DevComment="")
+GameplayTagList=(Tag="Weapon.CanReload",DevComment="")
+GameplayTagList=(Tag="Weapon.CanSwitch",DevComment="")
+GameplayTagList=(Tag="Weapon.PrimarySlot",DevComment="")
+GameplayTagList=(Tag="Weapon.SecondarySlot",DevComment="")
+GameplayTagList=(Tag="Weapon.SpecialSlot",DevComment="")

View File

@@ -82,3 +82,6 @@ DefaultTouchInterface=/Engine/MobileResources/HUD/DefaultVirtualJoysticks.Defaul
-ConsoleKeys=Tilde
+ConsoleKeys=Tilde
[/Script/EnhancedInput.EnhancedInputDeveloperSettings]
bEnableUserSettings=True

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

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