Commit Graph

179 Commits

Author SHA1 Message Date
MH261677
4357537009 Updated TempCharacter to create NoiseEmitter
Got the NoiseEmitter component and then used the makenoise function to make it create noise everytime the player walks
2023-03-05 17:41:39 +00:00
e8c20e2d67 Merge branch 'dev' into Turn-Based-Combat
# Conflicts:
#	Content/Blueprints/Combat_UI/CombatCharacter.uasset
#	Content/BungeeMan/Mat_BungeeMan_Rubber.uasset
#	Content/Dialogue/NPCTest.uasset
#	Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp
2023-02-28 15:29:35 +00:00
02832aee0e Updated TurnBasedCombat for Event Delegation 2023-02-27 20:01:02 +00:00
775f3b4945 Added Function Stub for Turn Events 2023-02-27 17:32:34 +00:00
e496cf07e9 Updated TurnBasedCombat to Use StatusSystem 2023-02-27 04:55:55 +00:00
fb697f3588 Added Thorns Status Effect for Combat 2023-02-27 04:55:12 +00:00
9b0ef82e7c Updated TurnBasedCombat to Include New Combos 2023-02-27 04:07:19 +00:00
e96c3411c0 Updated StatusSystem for Seconds Countdown 2023-02-27 03:46:06 +00:00
a6ef9f76cd Merge branch 'Dialogue-System' into dev 2023-02-25 02:27:38 +00:00
2f47693608 Bugfix Expiry Timers Not Getting Invalidated 2023-02-25 01:25:32 +00:00
939d1e8b92 Bugfix StatusEffects Not Being Added to Player 2023-02-25 00:20:49 +00:00
88323e4ea6 Updated EatableItems to Add Status Effects 2023-02-23 17:48:20 +00:00
MARCEL HARA
ce4f3aff1f Added SneakMechanicTesting level
Added new level for sneak mechanic testing
2023-02-23 16:03:10 +00:00
MARCEL HARA
119b5a141a Updated TempCharacter to remove unused Ulogs 2023-02-23 15:19:32 +00:00
37deb51b5f Added HealOverTime Status Effect for Testing 2023-02-23 03:50:26 +00:00
adba724dba Updated StatusSystem for Base UI and Time Functionality 2023-02-23 03:05:09 +00:00
985e713659 Bugfix No Post Processing Volume Crashes Engine 2023-02-23 01:28:29 +00:00
c880eb27ac Updated StatusSystem Struct for Bool Comparisons 2023-02-23 01:05:27 +00:00
31a6a5d98e Added StatusEffect Stub for Multiple Status Effects 2023-02-20 17:58:32 +00:00
MARCEL HARA
e9af8b713f Updated EatableItems to fix Ammo Consuming
Fixed ammo consuming crashing the client
2023-02-20 14:49:05 +00:00
26f21a9136 Updated DialogueNPC to use Ranged For Loops 2023-02-20 09:50:09 +00:00
MH261677
618a9509ca Updated EatableItems to add ammo {UNSTABLE}
Added functionality to the ammo count currently unstable as need to wait for other programmer to understand why it crashes.
2023-02-19 15:29:16 +00:00
MH261677
3c2d057951 Updated TempCharacter to destory ammo ore
destroys ammo ore when the player presses e on it
2023-02-19 15:28:34 +00:00
MH261677
43ef8e2110 Updated TempCharacter to sneak functionality
Added sneak functionality which makes the sphere radius smaller near enemies.
2023-02-17 13:12:28 +00:00
MARCEL HARA
77c43ab3d1 Updated TempCharacter to find AI Sphere 2023-02-16 15:02:58 +00:00
9bfb07fbba Updated DialogueNPC to Add Ids for Dialogue Paths 2023-02-09 17:01:03 +00:00
d1fab9f9a1 Updated DialogueNPC for Structs and Dialogue Paths 2023-02-09 03:12:27 +00:00
MH261677
324f062cc7 Updated EatableItems for AmmoFunctionality
Added ammo base functionality for using the ammo item in game
2023-02-07 00:11:00 +00:00
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