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
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
MARCEL HARA
00677164b3
Updated all lighting to whole scene
...
Changed the lighting and crystal placements in the starter place and the hub world
2023-03-29 17:03:00 +01:00
Phoebe
2787f29e16
mushrooms added and textures
2023-03-29 16:59:07 +01:00
EMILY TAYLOR
25e20d53f7
Added Lamp Asset for Tutorial Level
2023-03-29 16:22:00 +01:00
EMILY TAYLOR
7ec5c4442f
Added Book and Material
...
Implemented book asset in game and material.
2023-03-29 16:19:37 +01:00
CHARLIE SEYMOUR
5307c9c02d
Added combat and material bars
2023-03-29 15:48:08 +01:00
George Taylor
f723db11c9
Imported the styalised textures bitmaps into Unreal
2023-03-29 14:40:05 +01:00
c0ff4f6b9f
Bugfix Origin on Ropebridge
2023-03-29 13:10:14 +01:00
2e6398da59
Bugfix Input Not Being Re-Enabled On Respawn
2023-03-28 05:19:41 +01:00
8407c02042
Updated Build Map for Light Build
2023-03-28 05:08:52 +01:00
2c9de7ee58
Bugfix Invisible Plane When Entering Large Room Block
2023-03-28 05:01:07 +01:00
b51ac385cd
Bugfix Inventory Widget Anchors Not Correctly Set
2023-03-28 04:56:56 +01:00
e8c29d8004
Updated Build Map to Include Rope Bridge & More Direction
2023-03-28 04:53:13 +01:00
1b4a2673e3
Updated Combat UI for New Conventions (WIP)
2023-03-28 04:36:27 +01:00
544de9810c
Updated Combat Character Increased Sprint Speed
2023-03-28 03:46:35 +01:00
3f5c7bcf1c
Bugfix Merchant Unable to Purchase Items
2023-03-28 03:43:31 +01:00
e28da9ab26
Added Lights In Shop
2023-03-28 03:16:39 +01:00
24d0f2b334
Added Wooden Sign to Direct Players
2023-03-28 03:11:41 +01:00
phoebe
fe60960c21
ADDED SMALL MUSHROOMS
2023-03-27 17:31:10 +01:00
Charlie Seymour
cef9cd9d7b
Added Custom Health bars
...
Health only
2023-03-23 17:55:59 +00:00
Blue Probert
470c78421b
Added level for enemy testing aswell as made reaction speed public.
2023-03-23 17:50:13 +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
6f9f95ab9d
Attempted fix widget to merchant system
2023-03-14 13:04:33 +00:00
363623a315
Updated Build Map for Goat Tweaks
2023-03-14 05:05:20 +00:00
acbbed522b
Cooked New Materials for Build
2023-03-14 04:47:53 +00:00
7d078cbb4c
Added Sprint using Left Shift
2023-03-14 04:40:13 +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
5b6461224a
Updated Build Map for Organisation of Objects
2023-03-14 00:44:57 +00:00
b27f6ef064
Added Flashlight Tutorial
2023-03-14 00:34:06 +00:00
63b6c20c13
Updated Combat Character to Toggle Flashlight
2023-03-14 00:31:06 +00:00
576c8fc2a5
Baked Atlas for Break Particle Effect
2023-03-14 00:22:57 +00:00
a12aedde9d
Added Breathing Effect on Breakable Walls
2023-03-13 23:59:40 +00:00
78382d7b97
Updated Build Level to Re-Add Science Buildings
2023-03-13 23:18:43 +00:00
