Commit Graph

349 Commits

Author SHA1 Message Date
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
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
fd99e87d77 Updated Science Buildings to Fix Origins & Scales 2023-03-13 23:18:13 +00:00
b7a5d974ac Updated Build Map to Stop Goats from Colliding 2023-03-13 22:17:44 +00:00
4d77431338 Merge branch 'Quest-&-Dialogue-System' into dev 2023-03-13 22:02:36 +00:00
17afc60c22 Merge branch 'houes-modles' into dev
# Conflicts:
#	Content/Levels/Build.umap
2023-03-13 18:20:17 +00:00
bef31d5738 Merge branch 'environment_assets' into dev 2023-03-13 18:12:50 +00:00
af86084f3e Updated Quest UI to Display Tasks 2023-03-13 18:11:42 +00:00
bfa6c24ee9 Bugfix New UI Not Displaying 2023-03-13 18:10:02 +00:00
Rowland Rowland
23985317a2 Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev 2023-03-13 17:23:18 +00:00