1b4a2673e3
Updated Combat UI for New Conventions (WIP)
2023-03-28 04:36:27 +01:00
3f5c7bcf1c
Bugfix Merchant Unable to Purchase Items
2023-03-28 03:43:31 +01:00
Blue Probert
e2ca14c83f
Bugfix Important Stats Widget Renamed
2023-03-23 17:27:17 +00:00
Marcel Hara
0779e31c75
Updated Positions of Items to Merchant Shop
...
Fixed the origin of the items and properly positioned and scaled items to make the merchant shop work fully
2023-03-16 17:18:01 +00:00
Marcel Hara
df4499fdde
Updated TempCharacter to fix Camera issues
...
Fixed the UI not returning after player exits the merchant. Fixed the bug where if a player jumps and interacts with the merchant and then exits the camera is stuck in the air instead of resetting properly.
2023-03-16 16:31:40 +00:00
MH261677
093825dc0d
Potential fix for merchant system UI
...
** POTENTIALLY FIXED NEED TO TEST**
2023-03-16 14:49:17 +00:00
Marcel Hara
6f9f95ab9d
Attempted fix widget to merchant system
2023-03-14 13:04:33 +00:00
7585520586
Added Death Screen
2023-03-14 04:17:29 +00:00
c5409fcaa7
Removed Merchant Soft Lock for Build
...
Merchant SEVERELY BUGGY FUNCTIONALITY HAS BEEN DISABLED
2023-03-14 04:01:09 +00:00
ca87feaf2a
Bugfix Getting Wrong Widget for Dialogue
2023-03-14 01:33:06 +00:00
4d77431338
Merge branch 'Quest-&-Dialogue-System' into dev
2023-03-13 22:02:36 +00:00
af86084f3e
Updated Quest UI to Display Tasks
2023-03-13 18:11:42 +00:00
Marcel Hara
688a724a62
Merge branch 'dev' into UI-Implementation
...
# Conflicts:
# Content/Blueprints/Player/BP_MyTempCharacter.uasset
# Content/Levels/Top_layer_level.umap
2023-03-13 17:13:56 +00:00
Marcel Hara
c5ef154a3f
Fixed Ammo items being destroyed
...
Fixed the ammo items being destroyed from the inventory
2023-03-13 17:06:10 +00:00
Marcel Hara
7e8ded362a
Added All Item ammo types
...
Added every item ammo type to the game
2023-03-13 17:00:08 +00:00
3a99e71bde
Added Base Stub for Quest System
2023-03-13 05:19:13 +00:00
76b2d78f0e
Updated Dialogue for Choices
2023-03-13 04:49:09 +00:00
Marcel Hara
17df5728d9
Added WBP_Maps,WBP_Settings to MainMenuWidg
...
Added new widgets and now adding functionaity to escape button to make it close and re-open the menu
2023-03-06 17:27:16 +00:00
da1b3e9137
Bugfix Null Cached AI References
2023-03-06 15:37:31 +00:00
6db0770582
Bugfix Crouch Crashing Game
2023-03-06 15:00:08 +00:00
b16f632537
Updated Combat to Hide Gold & Health Text
2023-03-06 05:25:36 +00:00
0a0c5ed017
Bugfix Combat Initiation Not Checking AI Blackboard
2023-03-06 04:56:05 +00:00
d100a85a0d
Updated Combat to Set Camera to Face Enemy
2023-03-06 04:28:13 +00:00
b5048e4be3
Updated Project Settings for Build
2023-03-06 00:22:09 +00:00
1cf40d1c05
Merge branch 'Hub-level-blockout' into dev
2023-03-06 00:20:01 +00:00
MH261677
fd16d32de7
Updated TempCharacter to cleanup
...
Cleaned up unused code/logs
2023-03-05 17:44:58 +00:00
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
0bf0b5a220
Updated StatusSystem to Display Active Turns
2023-03-02 15:37:36 +00:00
c742abfce4
Added DamageOverTime Status Effect for Combat
2023-03-02 15:06:31 +00:00
0be235f6b1
Updated Thorns Status Effect to Trigger OnPlayerDamage
2023-03-02 03:25:00 +00:00
6227b4952c
Updated StatusSystem to Bind Player/Enemy Turn Events
2023-02-28 16:48:30 +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
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
