| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 |