Rowland Rowland
b4a8af9d43
Added platform for quest giver
...
Copied temporary platform at rope bridge and placed one next to it for the guest giver
2023-04-27 17:28:49 +01:00
Rowland Rowland
4579c73929
Fixed collision issues
...
Had an issue on Monday, seems to be fixed and pushed now
2023-04-27 17:20:07 +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
2df31aa719
Bugfix Camera Clipping and Render Depth On Book & Gun
2023-04-27 03:47:24 +01:00
383a85449e
Merge branch 'Combat' into dev
2023-04-26 13:20:48 +01:00
MH261677
a845c079a4
Merge branch 'fx-creation' into dev
...
# Conflicts:
# Content/Blueprints/Combat_UI/__RealTime/CombatCharacterRT.uasset
2023-04-26 13:09:58 +01:00
MH261677
873671db64
Updated BreakAsset to add FX
2023-04-26 13:04:05 +01:00
MH261677
8d20b563e7
Updated Gun FX to make smoke smaller
2023-04-26 12:59:44 +01:00
MH261677
be31b90112
Updated Gun FX to making smoke more realistic and emission change
...
Updated the color and the way the smoke moves to look more realistic and made the emission a lot lower to prevent smoke from lighting up the whole scene
2023-04-26 12:55:38 +01:00
MH261677
a90fccd72e
Updated Gun Effects to add smoke and sparks
...
added smoke and spark effects to the gun upon firing
2023-04-26 12:12:50 +01:00
MH261677
70b8c41c99
Imported Smoke Texture and created smoke mat
2023-04-26 12:12:30 +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
b1bdcb7618
Merge remote-tracking branch 'origin/Tutorial' into Combat
...
# Conflicts:
# Content/Blueprints/Combat_UI/CombatTutorial.uasset
2023-04-26 04:18:42 +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
fde1537dc0
Merge branch 'Book-UI' into dev
2023-04-25 04:31:26 +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
d0eaf37de7
Updated BookUI for Icon Positioning
2023-04-25 01:13:04 +01:00
e7121dbb49
Updated BookUI to Include Escape Button & Percent
2023-04-25 01:08:26 +01:00
eb43c252af
Updated BookUI to Include Element Icons
2023-04-25 01:07:35 +01:00
MH261677
a770fc47f1
Started working on sparks for gun
2023-04-24 18:43:22 +01:00
18ceedfa03
Updated Character to Convert Screen Space to World for Interaction
2023-04-24 18:01:51 +01:00
Kacper Szelest
0384c4977d
Changed location of text int tutorial
...
I changed the lovation of the text in the tutorial to fit the page better.
2023-04-24 16:08:45 +01:00
EMILY TAYLOR
795732d147
Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev
2023-04-24 16:07:45 +01:00
Kacper Szelest
00a22d1c39
Changed tutorial text
...
I shortened the text on the tutorial to condense it and not dump the player with text.
2023-04-24 16:07:09 +01:00
EMILY TAYLOR
58730a8573
Added Civilian Material in content drawer
...
Created material for Civilian Character for side quest, re-use Merchant Mesh from Merchant folder
2023-04-24 16:06:45 +01:00
George Taylor
e97ee6a9c7
Imported new beams into unreal
...
I updated the beams asset too have smoother edges
2023-04-24 15:54:24 +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
233125cc81
Merge branch 'Animations' into dev
2023-04-21 15:36:29 +01:00
8342865f74
Added Delay On Escape From Combat
2023-04-21 15:32:41 +01:00
39113cad58
Added Animation Blueprint for Goat Walking
2023-04-21 14:59:22 +01:00
2987ac3bb1
Merge remote-tracking branch 'origin/Animations' into dev
2023-04-21 14:46:12 +01:00
bc94d3aeae
Updated Intro Text for Cosmetic Changes
2023-04-21 14:41:06 +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
94f45d99c3
Added Combat UI Asset for World Space
2023-04-21 02:57:18 +01:00
793e096ed5
Merge remote-tracking branch 'origin/tutorial-functionality' into Book-UI
...
# Conflicts:
# Content/Levels/Build.umap
2023-04-20 22:30:57 +01:00
Kacper Szelest
19ebf111a3
Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev
2023-04-20 16:46:39 +01:00
