Commit Graph

390 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
MH261677
a770fc47f1 Started working on sparks for gun 2023-04-24 18:43:22 +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
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
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
Kacper Szelest
8102db3bc7 Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev 2023-04-20 16:07:35 +01:00
Kacper Szelest
e3c83ba4ff Added collisions to assets
I added collisions to assets
2023-04-20 16:07:17 +01:00
George Taylor
2ec38c4c60 Imported the improved environment assets
i imported the level environment too the unreal build
2023-04-20 15:53:07 +01:00
KACPER Szelest
9db6138385 Added river to level
I added a little river to our level
2023-04-19 22:39:51 +01:00
KACPER Szelest
6c59905e9b Created Water marterial
I created a water material to use for a little river we have in the level
2023-04-19 22:39:32 +01:00
KACPER Szelest
9c5f607b83 Updated cave level 1 objects with temp textures
I added temporary textures to the assets to have a decent looking level
2023-04-19 22:25:44 +01:00
KACPER Szelest
b88cc9dfe8 Added Temporary texture
I added a temporary texture to use for the level for testing purposes
2023-04-19 21:31:32 +01:00
KACPER Szelest
0616e21fbc Added temporary level assets 2023-04-19 21:30:10 +01:00
EMILY TAYLOR
7150d69759 Added Tutorial Assets in engine 2023-04-17 18:07:22 +01:00
MARCEL HARA
2f74de4889 Updated IntroText to add close button 2023-04-17 17:34:26 +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
985fdfa3af Updated Goat Textures 2023-04-17 17:21:45 +01:00
George Taylor
6455ce96a8 Fixed the Wood and Rock Textures
Imported the bitmaps as targas and fixed the wood and rock textures so they can be used in the build
2023-04-17 16:53:47 +01:00
dc7e00b5f3 Imported Goat Attack and Walking Animations 2023-04-17 16:53:01 +01:00
fa4857447c Merge branch 'UI_implementation' into dev 2023-04-17 15:03:56 +01:00
6003b61098 Merge remote-tracking branch 'origin/lighting-updates' into dev 2023-04-17 15:03:27 +01:00
Rowland Rowland
fb79fc9bdf Forgot to save the last change appropriatley 2023-03-30 17:01:18 +01:00
Rowland Rowland
574bd4a33d Added additonal lighting in front of the Merchant's cave
The player should now be guided towards the merchant once they enter the cavern
2023-03-30 17:00:22 +01:00
Rowland Rowland
3be617e9df Merge branch 'dev' into Combat-Testing 2023-03-30 16:43:42 +01:00
Rowland Rowland
e4187fad25 Removed remnants of hub 2023-03-30 16:37:05 +01:00
Rowland Rowland
01d90fcb3b Updated Merchant position and removed an enemy 2023-03-30 16:03:40 +01:00
Phoebe
76699b3be2 Mushrooms and textures 2023-03-30 15:40:30 +01:00
MARCEL HARA
fd64b18f61 Updated LOD to all crystals 2023-03-29 17:16:50 +01:00
MARCEL HARA
5e534b3af9 Updated Flashlight brightness 2023-03-29 17:16:11 +01:00
MARCEL HARA
95f81d3a10 Merge branch 'UI_implementation' into lighting-updates
# Conflicts:
#	Content/Levels/Build.umap
2023-03-29 17:08:57 +01:00