Commit Graph

646 Commits

Author SHA1 Message Date
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
feea306d11 Updated Combat to Replace Old Combos 2023-04-25 04:38:06 +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
34e5c78bf1 Updated Combat to Centre Cursor 2023-04-24 23:25:10 +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
EMILY TAYLOR
b41623bd11 Added Merchant Shop Materials
Merchant shop materials for engine
2023-04-24 16:55:59 +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
1b8bb13d7e Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev 2023-04-24 15:58:14 +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
EMILY TAYLOR
b25466f648 Added Textures for Civilian Character
Texture PNGs for Civilian character quest
2023-04-24 15:45:17 +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
55ec487cde Merge pull request #26 from Games-Academy-Student-Work-22-23/Delay-On-Run
Added Delay On Escape From Combat
2023-04-21 15:34:45 +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
ce142a9006 Merge remote-tracking branch 'origin/houes-modles' into dev 2023-04-21 14:45:50 +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
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
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
Kacper Szelest
b50e9dc161 Added UI elements and collisions
I added ui elements and collisions
2023-04-20 16:46:27 +01:00
George Taylor
5e28b7e6e2 Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev 2023-04-20 16:30:24 +01:00
George Taylor
66c26efeef Improved Rock Texture in Unreal
changed the bitmaps and graph for the rock texture
2023-04-20 16:29:56 +01:00