MarcelHara
bef17b7f04
Merge branch 'volumetric-fog' into dev
...
# Conflicts:
# Content/Blueprints/Combat_UI/CombatCharacter.uasset
# Content/Levels/Build.umap
2023-04-30 13:06:51 +01:00
99f88bb31c
Bugfix Combat Initialisation Calculation Failure on Tutorial
2023-04-28 05:33:08 +01:00
69dd199ad3
Updated Character to Expose Reaction Speed
2023-04-28 05:31:57 +01:00
cf433291a9
Bugfix Larger Health Values Break Health UI
2023-04-28 04:47:34 +01:00
38ffd4f339
Bugfix Force Look Pitch Not Correctly Set
2023-04-28 03:59:03 +01:00
9ecbd9c52d
Updated GoatAI to Trigger Attack Animations
2023-04-28 03:40:41 +01:00
9199db00df
Bugfix Merchant Unable to Interact
2023-04-28 01:40:49 +01:00
Blue Probert
0f0618ed0a
Bugfix Heal Over Time Exposed Heal Amount
2023-04-27 17:59:06 +01:00
Blue Probert
fc8c6bae19
Bugfix Crash On Damage Over Time Kill
2023-04-27 17:50:13 +01:00
Blue Probert
82ce8b2074
Bugfix Crash on No Post Processing Component
2023-04-27 17:40:40 +01:00
MARCEL HARA
38caa46e58
Updated Interaction.cpp to fix certain crashes
2023-04-27 17:19:01 +01:00
69bd004895
Bugfix Combat Values Not Being Reset on Combat End
2023-04-27 07:22:40 +01:00
4f8f2b37d1
Updated Combat to Hide Book in Non-Combat
2023-04-27 07:19:19 +01:00
11c905613a
Updated Combat to Include Red Vignette on Damage Taken
2023-04-27 06:59:52 +01:00
9fd372ed9d
Updated Combat to Include Camera Shake on Shoot & Wall Break
2023-04-27 05:13:41 +01:00
19fcc0c063
Updated Combat to Include Enemy UI
2023-04-27 04:24:54 +01:00
4f336263fb
Bugfix Enemy Always Started First
2023-04-26 06:21:08 +01:00
37268a3dc2
Bugfix Unable to Escape in Some Situations
2023-04-26 05:51:07 +01:00
5634557af2
Bugfix Game End on Player Death & Lock Combat on Tutorial
2023-04-26 05:28:02 +01:00
32f20c12c3
Updated Combat to Include Damage Stacking
2023-04-26 03:52:22 +01:00
15d2734c52
Bugfix Pointer Retaining Position After Combat Has Ended
2023-04-26 03:51:17 +01:00
0c13de4668
Bugfix BindAction Consuming Left Mouse Input
2023-04-26 03:22:13 +01:00
f7c4fdac3f
Updated Combat to Include a Reload Effect
2023-04-26 02:10:01 +01:00
feea306d11
Updated Combat to Replace Old Combos
2023-04-25 04:38:06 +01:00
cf2a198c3e
Updated BookUI to Display Turn State and Escape Percentage
2023-04-25 04:23:51 +01:00
32e65e3f47
Updated BookUI for Cast & Clear Buttons
2023-04-25 03:46:52 +01:00
eb43c252af
Updated BookUI to Include Element Icons
2023-04-25 01:07:35 +01:00
34e5c78bf1
Updated Combat to Centre Cursor
2023-04-24 23:25:10 +01:00
18ceedfa03
Updated Character to Convert Screen Space to World for Interaction
2023-04-24 18:01:51 +01:00
3e34ab4c5c
Bugfix Bridge Massive Gap
2023-04-24 12:18:04 +01:00
ba35cfd06e
Bound Health Percent UI to Get Combat Character Health
2023-04-24 12:08:59 +01:00
fa3a811553
Added Tutorial Widget with Functionality
2023-04-24 11:54:28 +01:00
8342865f74
Added Delay On Escape From Combat
2023-04-21 15:32:41 +01:00
b5d451d948
Updated BookUI for Small Cosmetic Changes
2023-04-21 14:35:36 +01:00
7c39553dd2
Updated Book UI to Display Only Valid Combos
2023-04-21 04:26:09 +01:00
11a58bb836
Added 1st and 2nd Element UI Book Elements
2023-04-21 04:16:46 +01:00
02e1ec436c
Updated TurnBasedCombat to Use New Book UI
2023-04-21 03:44:01 +01:00
fe54fcb90b
Disabled Important Stats Widget to Use New Book UI
2023-04-21 03:01:22 +01:00
94f45d99c3
Added Combat UI Asset for World Space
2023-04-21 02:57:18 +01:00
MARCEL HARA
c412e8c163
Added TutorialText to game
...
added a ui and made it appear at the start of the game
2023-04-17 17:33:40 +01:00
f57960bed6
Added Quest System Stub
2023-03-29 17:36:24 +01:00
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
