MH261677
797c447d47
Added Ammo Icon to Images
2023-02-06 23:51:45 +00:00
MARCEL HARA
36c18382a2
Updated TempCharacter for sneaking vignette effect
...
Added a Vignette effect when crouching
2023-02-06 15:55:12 +00:00
MARCEL HARA
5b4da1f02e
Updated TempCharacter for Jump and Sneak
...
Added A sneak function and Jump function for the character
2023-02-06 15:26:22 +00:00
MARCEL HARA
0cf4ace43a
Updated TempCharacter
...
Added Jump function which is using ACharacter and started working on custom Sneak function
2023-02-06 14:30:13 +00:00
a16de31aa2
Merge remote-tracking branch 'origin/merchant-system-v4' into dev
2023-02-06 13:53:22 +00:00
d21486797d
Merge branch 'Dialogue-System' into dev
...
# Conflicts:
# Content/Blueprints/Combat_UI/CombatCharacter.uasset
2023-02-06 13:53:15 +00:00
ce78e1d53b
Merge remote-tracking branch 'origin/Turn-Based-Combat' into dev
2023-02-06 13:52:46 +00:00
7f3e3cbb52
Updated DialogueNPC to Add Dialogue via Blueprints
2023-02-06 03:28:53 +00:00
6310050647
Updated DialogueNPC for Text Animation Speed Property
2023-02-06 01:13:17 +00:00
MH261677
14c7d6b6d7
Updated TempCharacter.cpp
...
Cached the camera reference isntead of constantly casting for it
2023-02-04 18:34:53 +00:00
MH261677
81d926ffb3
Updated EatableItems.cpp
...
Made it so when the players health is above 100 they cant heal anymore. (Removed healing stacking)
2023-02-04 17:56:25 +00:00
MH261677
182f54a3c8
Updated TempCharacter.cpp
...
Added boolean to make inventory not open when in shop
2023-02-04 17:39:12 +00:00
acefce8bbc
Added InteractNPC to Line Trace for Interact
2023-02-02 03:15:50 +00:00
5c5b915225
Updated DialogueNPC to Disable Character Movement
2023-02-02 02:39:35 +00:00
9e451d4539
Bugfix Set Mouse Input to Only Poll Yaw Movement
2023-02-02 02:19:59 +00:00
014a670ec5
Bugfix Widget Focus Not Correctly Being Set
2023-02-02 02:06:55 +00:00
3433254463
Added DialogueNPC Actor Component with Text Animation
2023-02-02 01:59:33 +00:00
7a715c2e55
Bugfix Hard Reference for GunEffect not Saving
2023-01-31 03:13:17 +00:00
7c3a9e8725
Updated Combat System to Clear Battle Log on Combat Start
2023-01-31 02:19:11 +00:00
ed0bcc7c76
Updated CombatCharacter to Spawn GunEffect onClick
2023-01-31 01:48:35 +00:00
45374da8bb
Updated Combat System to Disengage from Combat
2023-01-31 01:39:42 +00:00
5b60412cf9
Updated TurnBaseCombat to Reset Resource Values
...
Temp until resource gathering
2023-01-31 01:25:54 +00:00
b84a16e926
Updated TurnBaseCombat to Link Health Values
2023-01-31 01:21:49 +00:00
f80f5f21ef
Bugfix Action Point Count Down
2023-01-31 01:02:03 +00:00
d18c547632
Bugfix Cursor Not Hiding After Combat
2023-01-31 00:56:53 +00:00
7e81387247
Merge remote-tracking branch 'origin/merchant-system-v4' into Turn-Based-Combat
...
# Conflicts:
# Content/Blueprints/Combat_UI/CombatCharacter.uasset
2023-01-31 00:50:59 +00:00
3f8a2266c4
Updated InitCombat to Decrease Combat Range
2023-01-31 00:32:03 +00:00
0de2753dff
Bugfix Clicking Instantly Activates Combat
2023-01-31 00:30:45 +00:00
e91d059c56
Bugfix Enemy Runs Away when User Init Combat
2023-01-31 00:30:14 +00:00
6092c22a2b
Updated TurnBasedCombat to Link Enemy Health
2023-01-31 00:04:24 +00:00
8b2b9d56cb
Updated HoldToInitCombat for Unreal Naming Conventions
2023-01-30 23:03:50 +00:00
cd17363421
Removed Legacy Source Code to Reduce Compilation
2023-01-30 23:03:20 +00:00
MH261677
f33c43689b
Updated Interaction,TempCharacter.cpp
...
Fixed being able to open the text widget while the selector is open so merchant is fully working now.
2023-01-30 21:07:36 +00:00
Marcel Hara
63e44f47e8
Changed Interaction.cpp comment change
...
Changed the ref comment
2023-01-30 17:23:19 +00:00
Marcel Hara
11e6393726
Updated Interaction,TempCharacter.cpp
...
Removed the code from TempCharacter from last commit and created a new function Inside of Interaction that activates the TempCharacter.cpp InputEnabler()
2023-01-30 17:21:10 +00:00
MARCEL HARA
810b4b1680
TemporarilyBroken TempCharacter.cpp
...
Attempted to fix the close button currently it crashes.
2023-01-26 18:12:24 +00:00
MARCEL HARA
6faa177f96
Updated Interaction.cpp
...
Referenced the two buy confirms screen so I can just hide them and cache them upon the start of the game to optimize and fix many bugs such as being able to stack the buy screens.
2023-01-26 17:43:07 +00:00
MARCEL HARA
ddc2ef526d
Updated Interaction.cpp
...
Optimized more code by caching more widgets and instead of creating new widgets I am just toggling them on and off.
2023-01-23 17:41:55 +00:00
MARCEL HARA
3f4cdf5bfa
Updated Interaction.cpp
...
Optimized some functions and variables by storing them in beginplay
2023-01-23 16:14:15 +00:00
82c65b3fc4
Fix for Version Conflict
2023-01-17 08:46:31 +00:00
faf37bce52
Bugfix Collisions on Tunnel Pathways Partially Corrected
2023-01-17 05:13:02 +00:00
41bee1b0bd
Merge remote-tracking branch 'origin/merchant-system-v3' into AI-Perception
2023-01-17 04:20:15 +00:00
MH261677
cba221ec82
Merge branch 'Beta-Level' into merchant-system-v3
...
# Conflicts:
# Content/Blueprints/Combat_UI/Combat_UI.uasset
2023-01-17 02:46:42 +00:00
MH261677
e892260e32
Updated TempCharacter.cpp
...
Changed ULOG in function LineTraceLogic
2023-01-17 01:22:38 +00:00
MH261677
084ad419c5
Updated TempCharacter.cpp
...
Fixed double linetracing issue
2023-01-16 23:41:22 +00:00
MH261677
e15a7076c4
Updated TempCharacter.cpp
...
Fixed the tracedistance not defaulting back once the player exits the shop
2023-01-16 21:25:54 +00:00
MH261677
6f28d139ac
Updated Interaction.cpp
...
Created camera movement functions and updating input disabler functions
2023-01-16 20:44:47 +00:00
MH261677
3752a24eab
Updated TempCharacter
...
Created camera function which pans the camera to the object and raises FOV, Fixed multiple bugs to do with disabling input, Created BuyItem function which raises the TraceDistance temporarily so user can purchase at longer distances
2023-01-16 20:44:23 +00:00
MH261677
7aa3a702d6
Updated Interaction.cpp
...
Script now looks for the camera on the player making it ready to start moving the camera to the items
2023-01-16 17:35:11 +00:00
MH261677
ab2d2118dd
Updated Interaction.cpp
...
Added base functionality for both functions to make camera move
2023-01-16 17:02:12 +00:00
