MARCEL HARA 
							
						 
					 
					
						
						
						
						
							
						
						
							38caa46e58 
							
						 
					 
					
						
						
							
							Updated Interaction.cpp to fix certain crashes  
						
						 
						
						
						
						
					 
					
						2023-04-27 17:19:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marcel Hara 
							
						 
					 
					
						
						
						
						
							
						
						
							6f9f95ab9d 
							
						 
					 
					
						
						
							
							Attempted fix widget to merchant system  
						
						 
						
						
						
						
					 
					
						2023-03-14 13:04:33 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							c5409fcaa7 
							
						 
					 
					
						
						
							
							Removed Merchant Soft Lock for Build  
						
						 
						
						... 
						
						
						
						Merchant SEVERELY BUGGY FUNCTIONALITY HAS BEEN DISABLED 
						
						
					 
					
						2023-03-14 04:01:09 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							63e44f47e8 
							
						 
					 
					
						
						
							
							Changed Interaction.cpp comment change  
						
						 
						
						... 
						
						
						
						Changed the ref comment 
						
						
					 
					
						2023-01-30 17:23:19 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							6faa177f96 
							
						 
					 
					
						
						
							
							Updated Interaction.cpp  
						
						 
						
						... 
						
						
						
						Referenced the two buy confirms screen so I can just hide them and cache them upon the start of the game to optimize and fix many bugs such as being able to stack the buy screens. 
						
						
					 
					
						2023-01-26 17:43:07 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MARCEL HARA 
							
						 
					 
					
						
						
						
						
							
						
						
							ddc2ef526d 
							
						 
					 
					
						
						
							
							Updated Interaction.cpp  
						
						 
						
						... 
						
						
						
						Optimized more code by caching more widgets and instead of creating new widgets I am just toggling them on and off. 
						
						
					 
					
						2023-01-23 17:41:55 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							6f28d139ac 
							
						 
					 
					
						
						
							
							Updated Interaction.cpp  
						
						 
						
						... 
						
						
						
						Created camera movement functions and updating input disabler functions 
						
						
					 
					
						2023-01-16 20:44:47 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							7aa3a702d6 
							
						 
					 
					
						
						
							
							Updated Interaction.cpp  
						
						 
						
						... 
						
						
						
						Script now looks for the camera on the player making it ready to start moving the camera to the items 
						
						
					 
					
						2023-01-16 17:35:11 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							ab2d2118dd 
							
						 
					 
					
						
						
							
							Updated Interaction.cpp  
						
						 
						
						... 
						
						
						
						Added base functionality for both functions to make camera move 
						
						
					 
					
						2023-01-16 17:02:12 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							4fa9ca74dd 
							
						 
					 
					
						
						
							
							Updated Interaction.cpp  
						
						 
						
						... 
						
						
						
						Fixed the game crashing if there isnt any WBP inputted in tempchar 
						
						
					 
					
						2023-01-15 16:13:11 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							120da84a3e 
							
						 
					 
					
						
						
							
							Updated Interaction  
						
						 
						
						... 
						
						
						
						Hard coded the 6 second wait timer after testing in engine 
						
						
					 
					
						2022-11-28 23:21:36 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							8c69f58a97 
							
						 
					 
					
						
						
							
							Updated BP_OPENDIAL, Interaction.cpp  
						
						 
						
						... 
						
						
						
						Changed the text in the widget and gave it a little animation. Made the Wait timer in interaction changeable in the editor. 
						
						
					 
					
						2022-11-28 23:15:41 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							b5772a024c 
							
						 
					 
					
						
						
							
							Updated Interaction.cpp  
						
						 
						
						... 
						
						
						
						Added a wait timer to close the widget once open automatically 
						
						
					 
					
						2022-11-28 22:52:51 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							8f0a770bfb 
							
						 
					 
					
						
						
							
							Removed ItemPurchaseComponent script  
						
						 
						
						... 
						
						
						
						Removed the script as I am not using it for now and solely sticking to creating the inventory system and items currently. 
						
						
					 
					
						2022-11-14 16:52:04 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							7699a088ae 
							
						 
					 
					
						
						
							
							Added Jelly1 and ItemPurchaseComponent class  
						
						 
						
						... 
						
						
						
						Jelly1 is the test item i am creating and i also added a health variable for the temp character 
						
						
					 
					
						2022-11-14 15:53:50 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							d29bb501c7 
							
						 
					 
					
						
						
							
							Updated Interaction,TempCharacter to cleanup  
						
						 
						
						... 
						
						
						
						I cleaned up and removed unused functions in both interaction and tempcharacter scripts. 
						
						
					 
					
						2022-11-13 22:21:51 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							846b21e4e9 
							
						 
					 
					
						
						
							
							Fixed Interaction Pop-Ups  
						
						 
						
						... 
						
						
						
						Interaction is now working with the merchant also added interaction class to setup this up. 
						
						
					 
					
						2022-11-13 16:43:01 +00:00