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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							4357537009 
							
						 
					 
					
						
						
							
							Updated TempCharacter to create NoiseEmitter  
						
						 
						
						... 
						
						
						
						Got the NoiseEmitter component and then used the makenoise function to make it create noise everytime the player walks 
						
						
					 
					
						2023-03-05 17:41:39 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							0bf0b5a220 
							
						 
					 
					
						
						
							
							Updated StatusSystem to Display Active Turns  
						
						 
						
						
						
						
					 
					
						2023-03-02 15:37:36 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							c742abfce4 
							
						 
					 
					
						
						
							
							Added DamageOverTime Status Effect for Combat  
						
						 
						
						
						
						
					 
					
						2023-03-02 15:06:31 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							0be235f6b1 
							
						 
					 
					
						
						
							
							Updated Thorns Status Effect to Trigger OnPlayerDamage  
						
						 
						
						
						
						
					 
					
						2023-03-02 03:25:00 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							6227b4952c 
							
						 
					 
					
						
						
							
							Updated StatusSystem to Bind Player/Enemy Turn Events  
						
						 
						
						
						
						
					 
					
						2023-02-28 16:48:30 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							e8c20e2d67 
							
						 
					 
					
						
						
							
							Merge branch 'dev' into Turn-Based-Combat  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	Content/Blueprints/Combat_UI/CombatCharacter.uasset
#	Content/BungeeMan/Mat_BungeeMan_Rubber.uasset
#	Content/Dialogue/NPCTest.uasset
#	Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp 
						
						
					 
					
						2023-02-28 15:29:35 +00:00