|
|
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 |
|
