|
|
fa6ca7835a
|
Updated Merchant Sister Quest for Improved Dialogue
|
2023-05-13 19:49:04 +01:00 |
|
|
|
6bb29703de
|
Added Coin Amount to Merchant and Inventory
|
2023-05-13 19:40:24 +01:00 |
|
|
|
afbb267c83
|
Updated C2Plane to Kill Player Instead of Restart
|
2023-05-13 19:29:39 +01:00 |
|
MarcelHara
|
70ee7e5e98
|
Merge branch 'recolour-merchantUI' into dev
|
2023-05-13 18:16:59 +01:00 |
|
MarcelHara
|
f17baf1891
|
Updated PlayerInventory and Settings BP logic
|
2023-05-13 18:16:12 +01:00 |
|
MarcelHara
|
ef34d5663e
|
Fixed logic handling the closing and opening of menus
|
2023-05-13 18:15:58 +01:00 |
|
MarcelHara
|
a33ea587b1
|
Updated All Merchant UI
|
2023-05-13 18:15:45 +01:00 |
|
|
|
7d63142ae7
|
Updated Quest Completed UI for New Design
|
2023-05-13 18:08:47 +01:00 |
|
|
|
717f56ff99
|
Updated Death Screen for New Design
|
2023-05-13 18:01:31 +01:00 |
|
|
|
bef64d33e3
|
Bugfix Sisters Pendant Quests
|
2023-05-13 17:51:23 +01:00 |
|
MarcelHara
|
b446ba7691
|
Updated Tooltip for all the items
|
2023-05-13 17:22:30 +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 |
|
MarcelHara
|
495f78a766
|
Added Functionality to new Inventory and fixed TAB not closing
|
2023-05-13 16:31:27 +01:00 |
|
MarcelHara
|
5dce69aad0
|
Updated Whole menu UI to final designs
|
2023-05-13 16:27:19 +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 |
|
|
|
72308aabb0
|
Updated Boss to Add Combat Variation (Scream)
|
2023-05-13 00:42:38 +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 |
|
|
|
ce4a2166c5
|
Merge remote-tracking branch 'origin/Dialogue' into dev
|
2023-05-12 23:59:18 +01:00 |
|
|
|
1254abfd0e
|
Added Inventory Notification Functionality
|
2023-05-12 23:50:30 +01:00 |
|
|
|
7a04920197
|
Merge branch 'dev' into Inventory-Notifications
|
2023-05-12 21:47:07 +01:00 |
|
|
|
2f582cb507
|
Updated Status Effects to Add Damage Down for Enemy & Player
|
2023-05-12 20:44:46 +01:00 |
|
|
|
0064e9a003
|
Bugfix Boss Idle Animation Not Looping
|
2023-05-12 17:06:21 +01:00 |
|
|
|
74dec9ba54
|
Bugfix Boss is Able to Move
|
2023-05-12 17:05:52 +01:00 |
|
Blue Probert
|
ded3f7881c
|
Changed player maximum ammo
|
2023-05-12 16:36:14 +01:00 |
|
|
|
7e46657e3a
|
Added Widget for Inventory Notification
|
2023-05-12 16:27:10 +01:00 |
|
Rowland Rowland
|
eb5871c5ed
|
Added boss room and 'fixed' collisions
Collisons are EXTREMELY broken so I've moved the boss to be closer to the entrance of the room
|
2023-05-12 16:09:03 +01:00 |
|
Rowland Rowland
|
fe3d05ca25
|
Added rock assets and additonal enemies in the last cave corridor
|
2023-05-12 14:53:50 +01:00 |
|
|
|
73204efa31
|
Updated Combat so that the Camera Stays Locked on During Combat
|
2023-05-12 14:38:58 +01:00 |
|
|
|
dd72b47a6d
|
Bugfix Able to Open Inventory During Combat
|
2023-05-12 13:51:08 +01:00 |
|
|
|
6373a6bdc7
|
Updated Tooltip Function to Get Correct Display Name
|
2023-05-12 13:23:18 +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 |
|
George Taylor
|
9202c667b9
|
Fixed the UV's of the boss room
I fixed the Uv's of the boss room too allow for them too be properly textured
|
2023-05-12 12:41:33 +01:00 |
|
Rowland Rowland
|
987e23ab50
|
Placed mushrooms and added lights
Placed the mushrooms and made them give of light to guide the player through the cavern
|
2023-05-12 12:13:34 +01:00 |
|
Rowland Rowland
|
7d0694860d
|
Finished adding statues
|
2023-05-12 11:25:49 +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 |
|
Kacper Szelest
|
e7b5127f23
|
Added talking stalegtite npc
I added the talking stalegtite NPC and added dialogue to it so the player can communicate with it.
|
2023-05-11 16:56:23 +01:00 |
|
Rowland Rowland
|
9461216e4b
|
Adding Statues
|
2023-05-11 16:49:25 +01:00 |
|
George Taylor
|
4fedf04054
|
Merge branch 'Set-Dressing-2' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into Set-Dressing-2
|
2023-05-11 16:11:51 +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 |
|
Rowland Rowland
|
720082090e
|
Added statue
|
2023-05-11 16:08:08 +01:00 |
|
Rowland Rowland
|
9d1f9c1d78
|
Added boss room again
Readded boss room after merge errors
|
2023-05-11 15:46:02 +01:00 |
|
MARCEL HARA
|
f4e5796f32
|
Merge pull request #37 from Games-Academy-Student-Work-22-23/qol-changes
Qol changes
|
2023-05-11 15:16:08 +01:00 |
|
MARCEL HARA
|
e687e67242
|
Added Credits to MainMenu and QOL changes
|
2023-05-11 15:14:50 +01:00 |
|
