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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							69dd199ad3 
							
						 
					 
					
						
						
							
							Updated Character to Expose Reaction Speed  
						
						 
						
						
						
						
					 
					
						2023-04-28 05:31:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							9199db00df 
							
						 
					 
					
						
						
							
							Bugfix Merchant Unable to Interact  
						
						 
						
						
						
						
					 
					
						2023-04-28 01:40:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							15d2734c52 
							
						 
					 
					
						
						
							
							Bugfix Pointer Retaining Position After Combat Has Ended  
						
						 
						
						
						
						
					 
					
						2023-04-26 03:51:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							eb43c252af 
							
						 
					 
					
						
						
							
							Updated BookUI to Include Element Icons  
						
						 
						
						
						
						
					 
					
						2023-04-25 01:07:35 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							fa3a811553 
							
						 
					 
					
						
						
							
							Added Tutorial Widget with Functionality  
						
						 
						
						
						
						
					 
					
						2023-04-24 11:54:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							fe54fcb90b 
							
						 
					 
					
						
						
							
							Disabled Important Stats Widget to Use New Book UI  
						
						 
						
						
						
						
					 
					
						2023-04-21 03:01:22 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							9b0ef82e7c 
							
						 
					 
					
						
						
							
							Updated TurnBasedCombat to Include New Combos  
						
						 
						
						
						
						
					 
					
						2023-02-27 04:07:19 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							985e713659 
							
						 
					 
					
						
						
							
							Bugfix No Post Processing Volume Crashes Engine  
						
						 
						
						
						
						
					 
					
						2023-02-23 01:28:29 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							3c2d057951 
							
						 
					 
					
						
						
							
							Updated TempCharacter to destory ammo ore  
						
						 
						
						... 
						
						
						
						destroys ammo ore when the player presses e on it 
						
						
					 
					
						2023-02-19 15:28:34 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							43ef8e2110 
							
						 
					 
					
						
						
							
							Updated TempCharacter to sneak functionality  
						
						 
						
						... 
						
						
						
						Added sneak functionality which makes the sphere radius smaller near enemies. 
						
						
					 
					
						2023-02-17 13:12:28 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MARCEL HARA 
							
						 
					 
					
						
						
						
						
							
						
						
							77c43ab3d1 
							
						 
					 
					
						
						
							
							Updated TempCharacter to find AI Sphere  
						
						 
						
						
						
						
					 
					
						2023-02-16 15:02:58 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							797c447d47 
							
						 
					 
					
						
						
							
							Added Ammo Icon to Images  
						
						 
						
						
						
						
					 
					
						2023-02-06 23:51:45 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MARCEL HARA 
							
						 
					 
					
						
						
						
						
							
						
						
							36c18382a2 
							
						 
					 
					
						
						
							
							Updated TempCharacter for sneaking vignette effect  
						
						 
						
						... 
						
						
						
						Added a Vignette effect when crouching 
						
						
					 
					
						2023-02-06 15:55:12 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MARCEL HARA 
							
						 
					 
					
						
						
						
						
							
						
						
							5b4da1f02e 
							
						 
					 
					
						
						
							
							Updated TempCharacter for Jump and Sneak  
						
						 
						
						... 
						
						
						
						Added A sneak function and Jump function for the character 
						
						
					 
					
						2023-02-06 15:26:22 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MARCEL HARA 
							
						 
					 
					
						
						
						
						
							
						
						
							0cf4ace43a 
							
						 
					 
					
						
						
							
							Updated TempCharacter  
						
						 
						
						... 
						
						
						
						Added Jump function which is using ACharacter and started working on custom Sneak function 
						
						
					 
					
						2023-02-06 14:30:13 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							a16de31aa2 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/merchant-system-v4' into dev  
						
						 
						
						
						
						
					 
					
						2023-02-06 13:53:22 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							14c7d6b6d7 
							
						 
					 
					
						
						
							
							Updated TempCharacter.cpp  
						
						 
						
						... 
						
						
						
						Cached the camera reference isntead of constantly casting for it 
						
						
					 
					
						2023-02-04 18:34:53 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							182f54a3c8 
							
						 
					 
					
						
						
							
							Updated TempCharacter.cpp  
						
						 
						
						... 
						
						
						
						Added boolean to make inventory not open when in shop 
						
						
					 
					
						2023-02-04 17:39:12 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							9e451d4539 
							
						 
					 
					
						
						
							
							Bugfix Set Mouse Input to Only Poll Yaw Movement  
						
						 
						
						
						
						
					 
					
						2023-02-02 02:19:59 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							f33c43689b 
							
						 
					 
					
						
						
							
							Updated Interaction,TempCharacter.cpp  
						
						 
						
						... 
						
						
						
						Fixed being able to open the text widget while the selector is open so merchant is fully working now. 
						
						
					 
					
						2023-01-30 21:07:36 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marcel Hara 
							
						 
					 
					
						
						
						
						
							
						
						
							11e6393726 
							
						 
					 
					
						
						
							
							Updated Interaction,TempCharacter.cpp  
						
						 
						
						... 
						
						
						
						Removed the code from TempCharacter from last commit and created a new function Inside of Interaction that activates the TempCharacter.cpp InputEnabler() 
						
						
					 
					
						2023-01-30 17:21:10 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MARCEL HARA 
							
						 
					 
					
						
						
						
						
							
						
						
							810b4b1680 
							
						 
					 
					
						
						
							
							TemporarilyBroken TempCharacter.cpp  
						
						 
						
						... 
						
						
						
						Attempted to fix the close button currently it crashes. 
						
						
					 
					
						2023-01-26 18:12:24 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MARCEL HARA 
							
						 
					 
					
						
						
						
						
							
						
						
							3f4cdf5bfa 
							
						 
					 
					
						
						
							
							Updated Interaction.cpp  
						
						 
						
						... 
						
						
						
						Optimized some functions and variables by storing them in beginplay 
						
						
					 
					
						2023-01-23 16:14:15 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							faf37bce52 
							
						 
					 
					
						
						
							
							Bugfix Collisions on Tunnel Pathways Partially Corrected  
						
						 
						
						
						
						
					 
					
						2023-01-17 05:13:02 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							cba221ec82 
							
						 
					 
					
						
						
							
							Merge branch 'Beta-Level' into merchant-system-v3  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	Content/Blueprints/Combat_UI/Combat_UI.uasset 
						
						
					 
					
						2023-01-17 02:46:42 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							e892260e32 
							
						 
					 
					
						
						
							
							Updated TempCharacter.cpp  
						
						 
						
						... 
						
						
						
						Changed ULOG in function LineTraceLogic 
						
						
					 
					
						2023-01-17 01:22:38 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							084ad419c5 
							
						 
					 
					
						
						
							
							Updated TempCharacter.cpp  
						
						 
						
						... 
						
						
						
						Fixed double linetracing issue 
						
						
					 
					
						2023-01-16 23:41:22 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							e15a7076c4 
							
						 
					 
					
						
						
							
							Updated TempCharacter.cpp  
						
						 
						
						... 
						
						
						
						Fixed the tracedistance not defaulting back once the player exits the shop 
						
						
					 
					
						2023-01-16 21:25:54 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							3752a24eab 
							
						 
					 
					
						
						
							
							Updated TempCharacter  
						
						 
						
						... 
						
						
						
						Created camera function which pans the camera to the object and raises FOV, Fixed multiple bugs to do with disabling input, Created BuyItem function which raises the TraceDistance temporarily so user can purchase at longer distances 
						
						
					 
					
						2023-01-16 20:44:23 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							52639d9af6 
							
						 
					 
					
						
						
							
							Updated TempCharacter.cpp, Interaction.cpp  
						
						 
						
						... 
						
						
						
						Added a function which can be called from blueprints to re-enable all input once a button is pressed
Fixed interaction boolean to reset itself back to false to make it so player can talk to NPC again without having to restart the game to interact with it. 
						
						
					 
					
						2023-01-15 16:15:06 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							29c3fdcf09 
							
						 
					 
					
						
						
							
							Updated Interaction, TempCharacter.cpp  
						
						 
						
						... 
						
						
						
						Created InputDisabler functions to disable player controls when dialouge box stops to start working on merchant 
						
						
					 
					
						2023-01-14 20:35:49 +00:00