MarcelHara
|
279c0dc7d8
|
Merged Build
|
2023-05-14 13:25:13 +01:00 |
|
MarcelHara
|
a2eb2a9849
|
Added lighting to boss room
|
2023-05-14 13:20:26 +01:00 |
|
|
|
f25519937b
|
Merge remote-tracking branch 'origin/dev' into Final-Quest
|
2023-05-13 22:36:02 +01:00 |
|
|
|
85394b0b72
|
Rebuilt All Images as Some Were Corrupted Failing Build
|
2023-05-13 22:35:50 +01:00 |
|
cs260086
|
18c8223476
|
Created folder for Itch.io content
added banner.png and cover_page.png
|
2023-05-13 21:36:22 +01:00 |
|
|
|
4d21cf7fda
|
Added Final Quest [WIP]
|
2023-05-13 20:21:21 +01:00 |
|
|
|
f2043868cd
|
Updated Intro Text for New Design
|
2023-05-13 20:13:45 +01:00 |
|
|
|
9dfbced885
|
Updated Combat Tutorial to Include New UI Elements
|
2023-05-13 20:11:58 +01:00 |
|
|
|
bc0aad5f6b
|
Updated Combat UI to Display Enemy Name
|
2023-05-13 19:58:29 +01:00 |
|
|
|
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 |
|
MarcelHara
|
7c7fb0db01
|
Updated TempCharacter to fix merchant exit bug and cached escapemenu
|
2023-05-13 17:58:13 +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
|
5ec863f4cf
|
Changed TempCharacter to cache InventoryUI
|
2023-05-13 16:27:39 +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 |
|
|
|
c6e5cb5e00
|
Updated Combat to Reward on Goat Kill
|
2023-05-13 01:17:59 +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 |
|
|
|
8d096d7e36
|
Merge remote-tracking branch 'origin/UI_cleanup' into dev
|
2023-05-12 23:59:48 +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 |
|
|
|
b9985228d2
|
Updated Combat System for Minor Cosmetic Changes
|
2023-05-12 21:45:51 +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 |
|
|
|
99b1763f4f
|
Bugfix Changed Max Ammo for Resource Bars
|
2023-05-12 16:51:06 +01:00 |
|
|
|
0c237ca411
|
Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev
|
2023-05-12 16:49:00 +01:00 |
|
|
|
afd166c868
|
Bugfix Camera Shake Due to Spam of Animations
|
2023-05-12 16:48:14 +01:00 |
|
CHARLIE SEYMOUR
|
4e628f6855
|
added pendant UI icon + version with background layer
|
2023-05-12 16:39:36 +01:00 |
|
Blue Probert
|
5a96e51268
|
Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev
|
2023-05-12 16:36:38 +01:00 |
|
Blue Probert
|
ded3f7881c
|
Changed player maximum ammo
|
2023-05-12 16:36:14 +01:00 |
|
|
|
ec1ebc729d
|
Bugfix for Overriding Local Rotation on Character Camera
|
2023-05-12 16:32:02 +01:00 |
|
