|
|
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 |
|
|
|
6bb29703de
|
Added Coin Amount to Merchant and Inventory
|
2023-05-13 19:40:24 +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 |
|
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 |
|
|
|
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 |
|
|
|
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 |
|
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 |
|
|
|
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 |
|
|
|
3aca076981
|
Updated Sisters Quest & Wrapped Text on Selections
|
2023-05-12 13:08:00 +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 |
|
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 |
|
MARCEL HARA
|
3a1e065054
|
Implimented title to mainmenu
|
2023-05-11 14:51:51 +01:00 |
|
|
|
2b66a5f804
|
Updated Combat Character for Camera Clipping
Enabled Generate Overlap Events During Level Streaming
|
2023-05-11 14:39:40 +01:00 |
|
|
|
902163d4fe
|
Updated Merchant for Pendant Quest & Attempted to Replace Open Dialogue
|
2023-05-11 08:52:30 +01:00 |
|
|
|
2ddb44d070
|
Added Sisters Pendant Quest Item for Side Quest
|
2023-05-11 06:15:45 +01:00 |
|
|
|
e8e4e86873
|
Updated Status System to Add Buff Jelly Functionality
|
2023-05-11 05:59:49 +01:00 |
|
|
|
d197dc4d7e
|
Updated Both Jellies to Use New Icons
|
2023-05-11 05:20:58 +01:00 |
|
|
|
d79159ef8a
|
Updated Combat Character to Have a Healing Jelly
|
2023-05-11 05:15:55 +01:00 |
|
|
|
88f73fe5db
|
Updated Build for Pick Up Book & Gun Quest
|
2023-05-11 04:50:45 +01:00 |
|
|
|
7b185adaf4
|
Updated Combat UI for Damage & Status Indicator, Miss Chance & Removed Battle Log
|
2023-05-11 04:00:03 +01:00 |
|
|
|
918ea38889
|
Updated Resource Items for UI Icons and Descriptions
|
2023-05-11 01:16:45 +01:00 |
|
MARCEL HARA
|
8a68ac5213
|
Merge pull request #35 from Games-Academy-Student-Work-22-23/implimenting-miningcrystals
Implimenting miningcrystals
|
2023-05-10 13:28:52 +01:00 |
|
MarcelHara
|
fc25c8adf0
|
Updated TempCharacter to start fixing bugs
|
2023-05-09 16:22:35 +01:00 |
|
MarcelHara
|
b0e9ad546b
|
Replaced mining crystals with the assets
|
2023-05-09 13:50:23 +01:00 |
|
|
|
2638e71f97
|
Updated Combat UI to Make Extra Turn More Readable
|
2023-05-09 13:29:52 +01:00 |
|
MarcelHara
|
e1027d5d8e
|
Merge remote-tracking branch 'origin/merchant-polish' into dev
|
2023-05-09 13:15:33 +01:00 |
|
MarcelHara
|
458bb20227
|
Git issues to upload part of merchant fix
|
2023-05-09 13:14:19 +01:00 |
|
