Commit Graph

151 Commits

Author SHA1 Message Date
b461f2e9c1 Bugfix Sometimes Getting Stuck on Starter Planks 2023-05-21 19:31:49 +01:00
a90b7da12f Updated Build for Additional Set Dressing 2023-05-21 19:20:51 +01:00
8b87098cf8 Updated Book & Gun to be Pickupable by Interact Key 2023-05-21 19:06:16 +01:00
8a8288fbff Bugfix Invisible Walls Breaking Line Trace 2023-05-21 16:34:33 +01:00
3f7c78d5a1 Updated Healing & Buff Jelly Item Icons 2023-05-20 01:16:08 +01:00
bc98daea6f Updated Build Map to Replace Cubes with Stairs 2023-05-20 00:42:22 +01:00
c64556aa57 Updated Build Level to Make Book & Gun More Visible 2023-05-19 15:01:27 +01:00
0d7e8c5187 Bugfix Quest System for Pendant Quest 2023-05-15 04:02:05 +01:00
3b828bb01c Updated Quests for Final Kill Boss Quest 2023-05-14 23:02:09 +01:00
KACPER Szelest
7fefd2cec4 updated mesh asset
I changed the mesh of the stalegtite to fix some issues
2023-05-14 16:02:10 +01:00
85394b0b72 Rebuilt All Images as Some Were Corrupted Failing Build 2023-05-13 22:35:50 +01:00
MarcelHara
e3d3061843 Merge branch 'dev' into inventory-ui-overhaul
# Conflicts:
#	Content/Assets/Characters/Merchant/AMerchant.uasset
#	Content/Blueprints/Combat_UI/CombatCharacter.uasset
#	Content/Blueprints/Items/BP_BuffJelly.uasset
#	Content/Blueprints/Items/BP_HealingJelly.uasset
#	Content/Blueprints/Items/ItemsInWorld/BP_BuffPlacedItem.uasset
#	Content/Blueprints/Items/ItemsInWorld/BP_HealingJellyItem.uasset
#	Content/Blueprints/Quests/Quest_SistersPendant.uasset
#	Content/Blueprints/Quests/Quest_SistersPendant_PT2.uasset
#	Content/Dialogue/SM_Merchant_Blueprint.uasset
2023-05-13 17:15:48 +01:00
MarcelHara
e241c76d89 Changed Item tooltips to look better and overhauled item logic 2023-05-13 17:10:36 +01:00
ea9c05fd88 Updated Item Icons for Buff and Healing Jellies 2023-05-13 16:55:49 +01:00
0bb7df43cf Bugfix Collisions & UV's in Maze 2023-05-13 16:42:26 +01:00
b8709401da Updated Boss for Dialogue and End Game Dialogue 2023-05-13 16:25:07 +01:00
0f47b962b3 Built Lighting for Build Level 2023-05-13 01:08:06 +01:00
c2e3ef5168 Updated UI for New Designs 2023-05-13 01:02:47 +01:00
0667273c45 Bugfix Collisions, UV's & Replaced Boss with Actual Boss 2023-05-13 00:13:42 +01:00
22c5f8163b Merge remote-tracking branch 'origin/Set-Dressing-2' into dev 2023-05-13 00:00:31 +01:00
Rowland Rowland
fe3d05ca25 Added rock assets and additonal enemies in the last cave corridor 2023-05-12 14:53:50 +01:00
Rowland Rowland
fd26944e0c Added resource assets into level 2023-05-12 13:12:42 +01:00
3aca076981 Updated Sisters Quest & Wrapped Text on Selections 2023-05-12 13:08:00 +01:00
Rowland Rowland
0c40d58104 Rebuilt lighting
Rebuilt the lighting which allegedly changed a bunch of things that needed saving.
2023-05-12 11:22:41 +01:00
George Taylor
a7604a3f09 Changed the rope bridge assets
I changed the rope bridge assets too have a dip in them instead of just being flat
2023-05-11 16:11:33 +01:00
MARCEL HARA
a3d232726e Fixed Merging to Dev 2023-05-11 14:37:24 +01:00
MARCEL HARA
62f8aac468 Merge remote-tracking branch 'origin/Set-Dressing' into dev
# Conflicts:
#	Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_004.uasset
#	Content/Levels/Build.umap
2023-05-11 14:19:49 +01:00
MARCEL HARA
83a9e5895e Merge branch 'Texturing' into dev
# Conflicts:
#	Content/Levels/Build.umap
2023-05-11 14:06:55 +01:00
Rowland Rowland
5727ccfb73 Fixed collisions in final room. Added Textures to floor. Added Boss 2023-05-11 12:13:13 +01:00
EMILY TAYLOR
3059e56eb8 Added UV map for tunnel
UV Mapped tunnel
2023-05-11 12:10:33 +01:00
MARCEL HARA
acbff94bc6 Merge pull request #36 from Games-Academy-Student-Work-22-23/merchant-ui-nonactive
Fixed UI not being interactable
2023-05-11 11:57:30 +01:00
MARCEL HARA
5bf8d73d21 Fixed UI not being interactable 2023-05-11 11:56:03 +01:00
EMILY TAYLOR
0741c63162 Imported Shop textures
Decorated merchant shop and added textures
2023-05-11 11:42:41 +01:00
Rowland Rowland
15e56412fa Changed final room
Changed final room to a circular arena
2023-05-11 11:18:24 +01:00
902163d4fe Updated Merchant for Pendant Quest & Attempted to Replace Open Dialogue 2023-05-11 08:52:30 +01:00
88f73fe5db Updated Build for Pick Up Book & Gun Quest 2023-05-11 04:50:45 +01:00
0cb98acbb5 Updated Uv's on Start Area Objects 2023-05-11 00:21:51 +01:00
38591bfcac Merge branch 'dev' into Boss-Combat 2023-05-08 23:48:56 +01:00
b32e3c21d9 Applied New Gun Model to Combat Character 2023-05-08 23:40:44 +01:00
a17a80cf13 Applied Pendant Texture 2023-05-08 22:44:19 +01:00
e0130ffff5 Merged Boss Character Static Meshes for Animation 2023-05-08 21:59:40 +01:00
cfaa192304 Merge branch 'houes-modles' into dev 2023-05-08 20:00:47 +01:00
Alicia
6121262a97 Reimported the pendant 2023-05-07 21:24:10 +01:00
006ef56692 Merge branch 'houes-modles' into dev 2023-05-07 19:39:07 +01:00
Alicia
06a9295430 Added pendant object 2023-05-04 18:59:46 +01:00
Rowland Rowland
8008000522 Merge remote-tracking branch 'origin/dev' into side-area-2nd-gig
# Conflicts:
#	Content/Levels/Build.umap
2023-05-04 18:01:54 +01:00
5b1abf1a70 Merge pull request #31 from Games-Academy-Student-Work-22-23/MainMenu-Creation
Main menu creation
2023-05-04 18:00:19 +01:00
Rowland Rowland
86f9810685 Fixed collisions. Fixed bug of respawn. Added maze
Side area and final area collisions fixed. Enemy falling no longer triggers respawn. Added maze for side area.
2023-05-04 17:58:13 +01:00
Phoebe Harris-Wilson
8a7dc816ca Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev
# Conflicts:
#	Content/Levels/Build.umap
2023-05-04 17:48:46 +01:00
Phoebe Harris-Wilson
4c68c5e7ee Elements for probertium, eis, azos and iroquid model and textures
you can find it in unreal under the assets folder and then the elements folder
2023-05-04 17:42:42 +01:00