902163d4fe
Updated Merchant for Pendant Quest & Attempted to Replace Open Dialogue
2023-05-11 08:52:30 +01:00
814c2d6aaa
Bugfix Quest System Not Item Matching Correctly
2023-05-11 07:40:14 +01:00
fea2ccface
Updated Dialogue System to Call Custom Blueprint Functions
2023-05-11 06:32:11 +01:00
e8e4e86873
Updated Status System to Add Buff Jelly Functionality
2023-05-11 05:59:49 +01:00
f4a27fa5fe
Updated StatusSystem for One Status Effect of Each Type Can be Active
2023-05-11 05:13:19 +01:00
aa2f1fabcb
Updated Combat to Change the Chance to Miss Based on Enemy Type
2023-05-11 04:55:41 +01:00
88f73fe5db
Updated Build for Pick Up Book & Gun Quest
2023-05-11 04:50:45 +01:00
53126c6b10
Exposed Base Damage for Enemies
2023-05-11 04:12:00 +01:00
e308661c67
Removed Resource Reset on Combat Start
2023-05-11 04:01:57 +01:00
7b185adaf4
Updated Combat UI for Damage & Status Indicator, Miss Chance & Removed Battle Log
2023-05-11 04:00:03 +01:00
6e21026fcb
Updated Eatable Items to Balance Resource Amounts
2023-05-11 01:17:21 +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
4ad0959f08
Bug Fixed Mining crashing the game
...
When pressing E on the crystals it kept on crashing due to destroy being executed before pointer checks
2023-05-10 13:27:27 +01:00
MarcelHara
fc25c8adf0
Updated TempCharacter to start fixing bugs
2023-05-09 16:22:35 +01:00
2638e71f97
Updated Combat UI to Make Extra Turn More Readable
2023-05-09 13:29:52 +01:00
6a94ce98ec
Merge pull request #34 from Games-Academy-Student-Work-22-23/merchant-polish
...
Merchant polish
2023-05-09 13:10:38 +01:00
MarcelHara
b3c83f161f
Updated TempCharacter to stop crashes
2023-05-09 12:50:34 +01:00
6d8a4c82b0
Updated Dialogue for User Experience Improvements
...
In dialogue make arrow only appear when the animation is finished, Made things Bigger
2023-05-09 06:05:59 +01:00
487c46d7b8
Updated Combat System to Include Healing During Combat
2023-05-09 05:40:31 +01:00
cef7b1895b
Updated Boss Character to Trigger Animations
2023-05-09 04:29:19 +01:00
aa78522127
Updated Combat UI for User Experience Improvements
...
Hide buttons until they are available to use and disable resource buttons if there isn't any resources left
2023-05-09 02:55:31 +01:00
0115b7db1f
Updated Combat System to Hide Quest Widget in Combat
2023-05-09 00:42:03 +01:00
b32e3c21d9
Applied New Gun Model to Combat Character
2023-05-08 23:40:44 +01:00
MarcelHara
d8a4603651
Updated Merchant to fix buttons not working
2023-05-08 20:03:54 +01:00
2ab212324b
Bugfix Choosing Another Option Other Than a Add Quest Breaks Dialogue
2023-05-04 06:59:05 +01:00
daaa624dd9
Exposed Quest Flags to Dialogue System
2023-05-04 06:31:59 +01:00
fc9597ed33
Added Starter Quests
2023-05-04 05:12:43 +01:00
f24fcc2d25
Updated Quest System for UI
2023-05-04 05:04:37 +01:00
9bb98b314b
Updated Dialogue for Optimisations and Abstraction
2023-05-04 01:42:54 +01:00
d237e6c8de
Replaced Ripped Paper Image to Remove Padding
2023-05-02 11:23:35 +01:00
d1f959a9dc
Updated Quest & Dialogue to Add Quests from Dialogue
2023-05-02 07:16:40 +01:00
e3027fcd24
Updated Quest System for Functionality
2023-05-02 05:42:48 +01:00
bff44b56a7
Bugfix Able to Click Dialogue on Choice Select
2023-05-01 05:23:43 +01:00
MarcelHara
bef17b7f04
Merge branch 'volumetric-fog' into dev
...
# Conflicts:
# Content/Blueprints/Combat_UI/CombatCharacter.uasset
# Content/Levels/Build.umap
2023-04-30 13:06:51 +01:00
99f88bb31c
Bugfix Combat Initialisation Calculation Failure on Tutorial
2023-04-28 05:33:08 +01:00
69dd199ad3
Updated Character to Expose Reaction Speed
2023-04-28 05:31:57 +01:00
cf433291a9
Bugfix Larger Health Values Break Health UI
2023-04-28 04:47:34 +01:00
38ffd4f339
Bugfix Force Look Pitch Not Correctly Set
2023-04-28 03:59:03 +01:00
9ecbd9c52d
Updated GoatAI to Trigger Attack Animations
2023-04-28 03:40:41 +01:00
9199db00df
Bugfix Merchant Unable to Interact
2023-04-28 01:40:49 +01:00
Blue Probert
0f0618ed0a
Bugfix Heal Over Time Exposed Heal Amount
2023-04-27 17:59:06 +01:00
Blue Probert
fc8c6bae19
Bugfix Crash On Damage Over Time Kill
2023-04-27 17:50:13 +01:00
Blue Probert
82ce8b2074
Bugfix Crash on No Post Processing Component
2023-04-27 17:40:40 +01:00
MARCEL HARA
38caa46e58
Updated Interaction.cpp to fix certain crashes
2023-04-27 17:19:01 +01:00
69bd004895
Bugfix Combat Values Not Being Reset on Combat End
2023-04-27 07:22:40 +01:00
4f8f2b37d1
Updated Combat to Hide Book in Non-Combat
2023-04-27 07:19:19 +01:00
11c905613a
Updated Combat to Include Red Vignette on Damage Taken
2023-04-27 06:59:52 +01:00
9fd372ed9d
Updated Combat to Include Camera Shake on Shoot & Wall Break
2023-04-27 05:13:41 +01:00
19fcc0c063
Updated Combat to Include Enemy UI
2023-04-27 04:24:54 +01:00
4f336263fb
Bugfix Enemy Always Started First
2023-04-26 06:21:08 +01:00
37268a3dc2
Bugfix Unable to Escape in Some Situations
2023-04-26 05:51:07 +01:00
5634557af2
Bugfix Game End on Player Death & Lock Combat on Tutorial
2023-04-26 05:28:02 +01:00
32f20c12c3
Updated Combat to Include Damage Stacking
2023-04-26 03:52:22 +01:00
15d2734c52
Bugfix Pointer Retaining Position After Combat Has Ended
2023-04-26 03:51:17 +01:00
0c13de4668
Bugfix BindAction Consuming Left Mouse Input
2023-04-26 03:22:13 +01:00
f7c4fdac3f
Updated Combat to Include a Reload Effect
2023-04-26 02:10:01 +01:00
feea306d11
Updated Combat to Replace Old Combos
2023-04-25 04:38:06 +01:00
cf2a198c3e
Updated BookUI to Display Turn State and Escape Percentage
2023-04-25 04:23:51 +01:00
32e65e3f47
Updated BookUI for Cast & Clear Buttons
2023-04-25 03:46:52 +01:00
eb43c252af
Updated BookUI to Include Element Icons
2023-04-25 01:07:35 +01:00
34e5c78bf1
Updated Combat to Centre Cursor
2023-04-24 23:25:10 +01:00
18ceedfa03
Updated Character to Convert Screen Space to World for Interaction
2023-04-24 18:01:51 +01:00
3e34ab4c5c
Bugfix Bridge Massive Gap
2023-04-24 12:18:04 +01:00
ba35cfd06e
Bound Health Percent UI to Get Combat Character Health
2023-04-24 12:08:59 +01:00
fa3a811553
Added Tutorial Widget with Functionality
2023-04-24 11:54:28 +01:00
8342865f74
Added Delay On Escape From Combat
2023-04-21 15:32:41 +01:00
b5d451d948
Updated BookUI for Small Cosmetic Changes
2023-04-21 14:35:36 +01:00
7c39553dd2
Updated Book UI to Display Only Valid Combos
2023-04-21 04:26:09 +01:00
11a58bb836
Added 1st and 2nd Element UI Book Elements
2023-04-21 04:16:46 +01:00
02e1ec436c
Updated TurnBasedCombat to Use New Book UI
2023-04-21 03:44:01 +01:00
fe54fcb90b
Disabled Important Stats Widget to Use New Book UI
2023-04-21 03:01:22 +01:00
94f45d99c3
Added Combat UI Asset for World Space
2023-04-21 02:57:18 +01:00
MARCEL HARA
c412e8c163
Added TutorialText to game
...
added a ui and made it appear at the start of the game
2023-04-17 17:33:40 +01:00
f57960bed6
Added Quest System Stub
2023-03-29 17:36:24 +01:00
1b4a2673e3
Updated Combat UI for New Conventions (WIP)
2023-03-28 04:36:27 +01:00
3f5c7bcf1c
Bugfix Merchant Unable to Purchase Items
2023-03-28 03:43:31 +01:00
Blue Probert
e2ca14c83f
Bugfix Important Stats Widget Renamed
2023-03-23 17:27:17 +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
df4499fdde
Updated TempCharacter to fix Camera issues
...
Fixed the UI not returning after player exits the merchant. Fixed the bug where if a player jumps and interacts with the merchant and then exits the camera is stuck in the air instead of resetting properly.
2023-03-16 16:31:40 +00:00
MH261677
093825dc0d
Potential fix for merchant system UI
...
** POTENTIALLY FIXED NEED TO TEST**
2023-03-16 14:49:17 +00:00
Marcel Hara
6f9f95ab9d
Attempted fix widget to merchant system
2023-03-14 13:04:33 +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
ca87feaf2a
Bugfix Getting Wrong Widget for Dialogue
2023-03-14 01:33:06 +00:00
4d77431338
Merge branch 'Quest-&-Dialogue-System' into dev
2023-03-13 22:02:36 +00:00
af86084f3e
Updated Quest UI to Display Tasks
2023-03-13 18:11:42 +00:00
Marcel Hara
688a724a62
Merge branch 'dev' into UI-Implementation
...
# Conflicts:
# Content/Blueprints/Player/BP_MyTempCharacter.uasset
# Content/Levels/Top_layer_level.umap
2023-03-13 17:13:56 +00:00
Marcel Hara
c5ef154a3f
Fixed Ammo items being destroyed
...
Fixed the ammo items being destroyed from the inventory
2023-03-13 17:06:10 +00:00
Marcel Hara
7e8ded362a
Added All Item ammo types
...
Added every item ammo type to the game
2023-03-13 17:00:08 +00:00
3a99e71bde
Added Base Stub for Quest System
2023-03-13 05:19:13 +00:00
76b2d78f0e
Updated Dialogue for Choices
2023-03-13 04:49:09 +00:00
Marcel Hara
17df5728d9
Added WBP_Maps,WBP_Settings to MainMenuWidg
...
Added new widgets and now adding functionaity to escape button to make it close and re-open the menu
2023-03-06 17:27:16 +00:00
da1b3e9137
Bugfix Null Cached AI References
2023-03-06 15:37:31 +00:00
6db0770582
Bugfix Crouch Crashing Game
2023-03-06 15:00:08 +00:00
b16f632537
Updated Combat to Hide Gold & Health Text
2023-03-06 05:25:36 +00:00
0a0c5ed017
Bugfix Combat Initiation Not Checking AI Blackboard
2023-03-06 04:56:05 +00:00
d100a85a0d
Updated Combat to Set Camera to Face Enemy
2023-03-06 04:28:13 +00:00
b5048e4be3
Updated Project Settings for Build
2023-03-06 00:22:09 +00:00
1cf40d1c05
Merge branch 'Hub-level-blockout' into dev
2023-03-06 00:20:01 +00:00
MH261677
fd16d32de7
Updated TempCharacter to cleanup
...
Cleaned up unused code/logs
2023-03-05 17:44:58 +00:00
